feat(vcs): make unresolved merge conflicts visible wherever they come from (#905)

Conflicts left by stash pop or an automatic stash now get the same editor banner (File has unresolved merge conflicts, Resolve conflicts…) as merge conflicts. Complete conflict markers are reported as errors in every language and listed in Problems (severity under Settings › Editor › Inspections › Version Control). The toolbar shows Resolve/Continue and Abort next to the branch while conflicts or an interrupted operation exist, and the Commit view and Branches popup offer Resolve Conflicts even when no operation is in progress.

Co-authored-by: ntbang0901 <[email protected]>

src/platform/inspections.ts

@@ -225,6 +225,10 @@ export const SPELLING_INSPECTION = "builtin:spelling";
 export const DEPENDENCY_PRODUCER = "dependency-versions";
 export const DEPENDENCY_INSPECTION = "builtin:dependency-versions";
 
+/** Conflict markers left in a file by a merge, rebase, cherry-pick or stash that stopped on conflicts. */
+export const CONFLICT_MARKERS_PRODUCER = "merge-conflict-markers";
+export const CONFLICT_MARKERS_INSPECTION = "builtin:merge-conflict-markers";
+
 /** IDEA's Typo options: which parts of source files are checked (plain text always is). */
 export const SPELLING_OPTIONS = {
   code: "processCode",
@@ -234,6 +238,15 @@ export const SPELLING_OPTIONS = {
 
 /** Checks the IDE runs itself (not a language server). */
 export const BUILTIN_INSPECTIONS: readonly BuiltinInspection[] = [
+  {
+    id: CONFLICT_MARKERS_INSPECTION,
+    producer: CONFLICT_MARKERS_PRODUCER,
+    name: "Unresolved merge conflict markers",
+    group: "Version control",
+    description:
+      "Reports the <<<<<<<, ======= and >>>>>>> lines a merge leaves in a file, whatever its language and whether or not a language server is installed.",
+    defaultLevel: "error",
+  },
   {
     id: DEPENDENCY_INSPECTION,
     producer: DEPENDENCY_PRODUCER,

src/platform/locales/text/zh.json

@@ -5656,5 +5656,12 @@
   "Exit without applying the changes made in the result?": "不应用对结果所做的更改并退出吗？",
   "Apply Merge Result": "应用合并结果",
   "Merge Settings": "合并设置",
-  "Resolve Merge Change": "解决合并更改"
+  "Resolve Merge Change": "解决合并更改",
+  "File has unresolved merge conflicts": "文件存在未解决的合并冲突",
+  "Resolve conflicts…": "解决冲突…",
+  "Unresolved merge conflict marker": "未解决的合并冲突标记",
+  "Unresolved merge conflicts": "未解决的合并冲突",
+  "Reports the <<<<<<<, ======= and >>>>>>> lines a merge leaves in a file, whatever its language and whether or not a language server is installed.": "报告合并在文件中留下的 <<<<<<<、======= 和 >>>>>>> 行，与文件语言以及是否安装了语言服务器无关。",
+  "Merge/Rebase Widget": "合并/变基微件",
+  "Unresolved merge conflict markers": "未解决的合并冲突标记"
 }