mirror of
https://github.com/l0ng-ai/openidea.git
synced 2026-11-06 16:08:05 +00:00
ntbang0901
c2fa6f37ab
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 <121003585+ntbang0901@users.noreply.github.com>
23 lines
989 B
TypeScript
23 lines
989 B
TypeScript
import { expect, openFromTree, test } from "./fixtures";
|
|
|
|
const MARKERS = ["<<<<<<< Updated upstream", "ours();", "=======", "theirs();", ">>>>>>> Stashed changes"];
|
|
|
|
test("flags merge conflict markers typed into a file as errors, with no language server", async ({
|
|
workbench: page,
|
|
}) => {
|
|
const editor = await openFromTree(page, "build.gradle.kts");
|
|
await editor.locator(".cm-content").click();
|
|
await page.keyboard.press("Meta+ArrowDown");
|
|
await page.keyboard.press("Enter");
|
|
// Typed line by line: the editor indents each new line like the one above.
|
|
for (const line of MARKERS) {
|
|
await page.keyboard.type(line);
|
|
await page.keyboard.press("Enter");
|
|
}
|
|
// One error on each of the three marker lines.
|
|
await expect(editor.locator(".cm-lintRange-error")).toHaveCount(3);
|
|
// Undoing the marker lines clears them again.
|
|
for (let i = 0; i < 40; i++) await page.keyboard.press("Meta+z");
|
|
await expect(editor.locator(".cm-lintRange-error")).toHaveCount(0);
|
|
});
|