Skip to content

fix(editor): prevent syntax highlight color flicker on state recreation (#2304) #2457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Elitex07 wants to merge 3 commits into
base: main
Choose a base branch
from
+20 −5
Open

fix(editor): prevent syntax highlight color flicker on state recreation (#2304) #2457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3047d4b
fix(editor): prevent syntax highlight color flicker on state recreati…
Elitex07 Jul 8, 2026
fa4e008
style: normalize line endings with biome format
Elitex07 Jul 8, 2026
a9dbf87
fix(editor): move language extension cache assignment after successfu…
Elitex07 Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/lib/editorFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,6 +1465,8 @@ export default class EditorFile {
// Store mode info for later use when creating editor view
this.currentMode = mode;
this.currentLanguageExtension = modeInfo?.getExtension() || null;
this.__cmCachedLanguageExtension = null;
this.__cmCachedLanguageSignature = null;
if (options.recommend !== false) {
maybeRecommendLanguageModeExtension(this, modeInfo);
}
Expand Down
23 changes: 18 additions & 5 deletions src/lib/editorManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2709,6 +2709,8 @@ async function EditorManager($header, $body) {
effects: languageCompartment.reconfigure(ext || []),
});
file.session = targetEditor.state;
file.__cmCachedLanguageExtension = ext || [];
file.__cmCachedLanguageSignature = languageSignature;
markLanguageReady(file, languageSignature, true);
} catch (error) {
warnRecoverable("Failed to apply language extensions.", error, warnKey);
Expand All @@ -2722,6 +2724,14 @@ async function EditorManager($header, $body) {
return [];
}

if (
file.__cmCachedLanguageExtension &&
file.__cmCachedLanguageSignature === languageSignature
) {
markLanguageReady(file, languageSignature, true);
return file.__cmCachedLanguageExtension;
}

let result;
try {
result = langExtFn();
Expand All @@ -2735,12 +2745,13 @@ async function EditorManager($header, $body) {
markLanguageReady(file, languageSignature, false);
result
.then((ext) => {
if (file.__cmLanguageSignature !== languageSignature) {
return;
}
file.__cmCachedLanguageExtension = ext || [];
file.__cmCachedLanguageSignature = languageSignature;
const pane = getFileLspPane(file);
if (
!pane?.editor ||
pane.activeFile?.id !== fileId ||
file.__cmLanguageSignature !== languageSignature
) {
if (!pane?.editor || pane.activeFile?.id !== fileId) {
return;
}

Expand All @@ -2759,6 +2770,8 @@ async function EditorManager($header, $body) {
}

markLanguageReady(file, languageSignature, true);
file.__cmCachedLanguageExtension = result || [];
file.__cmCachedLanguageSignature = languageSignature;
return result || [];
}

Expand Down