Skip to content

Commit ed04f71

Browse files
committed
Reset token type of meta.embedded
Fixes microsoft/vscode#34857 See microsoft/vscode#34857 for more details about this issue
1 parent 95f30b1 commit ed04f71

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/grammar.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class ScopeMetadataProvider {
272272
return language;
273273
}
274274

275-
private static STANDARD_TOKEN_TYPE_REGEXP = /\b(comment|string|regex)\b/;
275+
private static STANDARD_TOKEN_TYPE_REGEXP = /\b(comment|string|regex|meta\.embedded)\b/;
276276
private static _toStandardTokenType(tokenType: string): StandardTokenType {
277277
let m = tokenType.match(ScopeMetadataProvider.STANDARD_TOKEN_TYPE_REGEXP);
278278
if (!m) {
@@ -285,6 +285,8 @@ class ScopeMetadataProvider {
285285
return StandardTokenType.String;
286286
case 'regex':
287287
return StandardTokenType.RegEx;
288+
case 'meta.embedded':
289+
return StandardTokenType.MetaEmbedded;
288290
}
289291
throw new Error('Unexpected match for standard token type!');
290292
}
@@ -927,7 +929,7 @@ export class StackElementMetadata {
927929
_languageId = languageId;
928930
}
929931
if (tokenType !== StandardTokenType.Other) {
930-
_tokenType = tokenType;
932+
_tokenType = tokenType === StandardTokenType.MetaEmbedded ? StandardTokenType.Other : tokenType;
931933
}
932934
if (fontStyle !== FontStyle.NotSet) {
933935
_fontStyle = fontStyle;

src/main.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ export const enum StandardTokenType {
5454
Other = 0,
5555
Comment = 1,
5656
String = 2,
57-
RegEx = 4
57+
RegEx = 4,
58+
MetaEmbedded = 8
5859
}
5960

6061
/**

0 commit comments

Comments
 (0)