diff --git a/extensions/html-language-features/server/src/modes/javascriptMode.ts b/extensions/html-language-features/server/src/modes/javascriptMode.ts
index 2e67f8cced42da1d64625bf2efc8299d4d995677..c7c803e56849254e6f5c78aa6ddbb4ee34918efc 100644
--- a/extensions/html-language-features/server/src/modes/javascriptMode.ts
+++ b/extensions/html-language-features/server/src/modes/javascriptMode.ts
@@ -292,9 +292,9 @@ export function getJavascriptMode(documentRegions: LanguageModelCache= rangeStartLine && endLine < rangeEndLine) {
let foldingRange: FoldingRange = { startLine, endLine };
- let match = document.getText(curr).match(/^\s*\/(\/\s*#(?:end)?region\b)|([\*\/])/);
+ let match = document.getText(curr).match(/^\s*\/(?:(\/\s*#(?:end)?region\b)|(\*|\/))/);
if (match) {
- foldingRange.type = match[1].length ? FoldingRangeType.Region : FoldingRangeType.Comment;
+ foldingRange.type = match[1] ? FoldingRangeType.Region : FoldingRangeType.Comment;
}
ranges.push(foldingRange);
}
diff --git a/extensions/html-language-features/server/src/test/folding.test.ts b/extensions/html-language-features/server/src/test/folding.test.ts
index adc3bcdbf9e013f165eb85b26a7fb3b52795df30..ab77c056e7b809bb8cf97544fbd56e7bae9c89df 100644
--- a/extensions/html-language-features/server/src/test/folding.test.ts
+++ b/extensions/html-language-features/server/src/test/folding.test.ts
@@ -130,7 +130,7 @@ suite('Object Folding', () => {
/* 6*/' };',
/* 7*/'',
/* 8*/'',
@@ -206,7 +206,7 @@ suite('Object Folding', () => {
/*2*/'',
];
assertRanges(input, [r(0, 1)]);
- });
+ });
test('Fold intersecting region', () => {
let input = [
@@ -218,7 +218,7 @@ suite('Object Folding', () => {
/*5*/'',
];
assertRanges(input, [r(0, 3)]);
- });
+ });
test('Test limit', () => {