Skip to content

Fix custom comment continuation for multiple follow-up lines #14074

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

Merged
bobbrow merged 3 commits into from
Dec 2, 2025
+10 −5
Merged

Fix custom comment continuation for multiple follow-up lines #14074

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9af2123
Fix custom comment continuation for multiple follow-up lines
dinhtam2c Dec 2, 2025
1abef89
Fix duplicated rules
dinhtam2c Dec 2, 2025
d6613ef
Fix missing "< 0" check
dinhtam2c Dec 2, 2025
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
15 changes: 10 additions & 5 deletions Extension/src/LanguageServer/languageConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ function getMLSplitAfterPattern(): string {

function getMLPreviousLinePattern(insert: string): string | undefined {
if (insert.startsWith("/*")) {
return `(?=^(\\s*(\\/\\*\\*|\\*)).*)(?=(?!(\\s*\\*\\/)))`;
const match: string = escape(insert);
return `(?=^(\\s*(${match}|\\*)).*)(?=(?!(\\s*\\*\\/)))`;
}
return undefined;
}
Expand Down Expand Up @@ -238,8 +239,9 @@ export function getLanguageConfig(languageId: string): vscode.LanguageConfigurat
}

export function getLanguageConfigFromPatterns(languageId: string, patterns?: (string | CommentPattern)[]): vscode.LanguageConfiguration {
const beginPatterns: string[] = []; // avoid duplicate rules
const continuePatterns: string[] = []; // avoid duplicate rules
const beginPatterns: string[] = []; // avoid duplicate begin rules
const continuePatterns: string[] = []; // avoid duplicate continue rules
const endPatterns: string[] = []; // avoid duplicate end rules
let duplicates: boolean = false;
let beginRules: vscode.OnEnterRule[] = [];
let continueRules: vscode.OnEnterRule[] = [];
Expand All @@ -258,14 +260,17 @@ export function getLanguageConfigFromPatterns(languageId: string, patterns?: (st
} else {
duplicates = true;
}
if (continuePatterns.indexOf(c.continue) < 0) {
if (continuePatterns.indexOf(`${c.begin}\0${c.continue}`) < 0) {
if (r.continue && r.continue.length > 0) {
continueRules = continueRules.concat(r.continue);
}
continuePatterns.push(`${c.begin}\0${c.continue}`);
}
if (endPatterns.indexOf(c.continue) < 0) {
if (r.end && r.end.length > 0) {
endRules = endRules.concat(r.end);
}
continuePatterns.push(c.continue);
endPatterns.push(c.continue);
}
});
if (duplicates) {
Expand Down
Loading