diff --git a/src/basic-languages/css/css.ts b/src/basic-languages/css/css.ts index 5afc7af5..2ddc06a0 100644 --- a/src/basic-languages/css/css.ts +++ b/src/basic-languages/css/css.ts @@ -6,7 +6,7 @@ import type { languages } from '../../fillers/monaco-editor-core'; export const conf: languages.LanguageConfiguration = { - wordPattern: /(#?-?\d*\.\d\w*%?)|((::|[@#.!:])?[\w-?]+%?)|::|[@#.!:]/g, + wordPattern: /(#?-?\d*\.\d\w*%?)|((::|[@#.!:])?[\w-]+%?)|::|[@#.!:]/g, comments: { blockComment: ['/*', '*/'] diff --git a/src/basic-languages/ecl/ecl.ts b/src/basic-languages/ecl/ecl.ts index ab12908e..8d1f168e 100644 --- a/src/basic-languages/ecl/ecl.ts +++ b/src/basic-languages/ecl/ecl.ts @@ -415,7 +415,7 @@ export const language = { [/@typesone/, 'type'], [ - /[a-zA-Z_$][\w-$]*/, + /[a-zA-Z_$][\w$-]*/, { cases: { '@functions': 'keyword.function', diff --git a/src/basic-languages/html/html.ts b/src/basic-languages/html/html.ts index f9ffed20..c33105f7 100644 --- a/src/basic-languages/html/html.ts +++ b/src/basic-languages/html/html.ts @@ -61,7 +61,7 @@ export const conf: languages.LanguageConfiguration = { `<(?!(?:${EMPTY_ELEMENTS.join('|')}))([_:\\w][_:\\w-.\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i' ), - afterText: /^<\/([_:\w][_:\w-.\d]*)\s*>$/i, + afterText: /^<\/([_:\w][_:\w.\d-]*)\s*>$/i, action: { indentAction: languages.IndentAction.IndentOutdent } diff --git a/src/basic-languages/less/less.ts b/src/basic-languages/less/less.ts index 4722c0e0..80563799 100644 --- a/src/basic-languages/less/less.ts +++ b/src/basic-languages/less/less.ts @@ -6,7 +6,7 @@ import type { languages } from '../../fillers/monaco-editor-core'; export const conf: languages.LanguageConfiguration = { - wordPattern: /(#?-?\d*\.\d\w*%?)|([@#!.:]?[\w-?]+%?)|[@#!.]/g, + wordPattern: /(#?-?\d*\.\d\w*%?)|([@#!.:]?[\w-]+%?)|[@#!.]/g, comments: { blockComment: ['/*', '*/'], lineComment: '//' diff --git a/src/basic-languages/m3/m3.ts b/src/basic-languages/m3/m3.ts index 300c7a6d..e4b05486 100644 --- a/src/basic-languages/m3/m3.ts +++ b/src/basic-languages/m3/m3.ts @@ -173,7 +173,7 @@ export const language = { // Integer- and real literals [/[0-9]+\.[0-9]+(?:[DdEeXx][\+\-]?[0-9]+)?/, 'number.float'], - [/[0-9]+(?:\_[0-9a-fA-F]+)?L?/, 'number'], + [/[0-9]+(?:_[0-9a-fA-F]+)?L?/, 'number'], // Operators, relations, and delimiters [ diff --git a/src/basic-languages/rust/rust.ts b/src/basic-languages/rust/rust.ts index a3938476..73396176 100644 --- a/src/basic-languages/rust/rust.ts +++ b/src/basic-languages/rust/rust.ts @@ -261,7 +261,7 @@ export const language = { '#' ], - escapes: /\\([nrt0\"''\\]|x\h{2}|u\{\h{1,6}\})/, + escapes: /\\([nrt0\"''\\]|x[0-9a-fA-F]{2}|u\{[0-9a-fA-F]{1,6}\})/, delimiters: /[,]/, symbols: /[\#\!\%\&\*\+\-\.\/\:\;\<\=\>\@\^\|_\?]+/, intSuffixes: /[iu](8|16|32|64|128|size)/, diff --git a/src/basic-languages/scss/scss.ts b/src/basic-languages/scss/scss.ts index f7af50ee..5e631a2e 100644 --- a/src/basic-languages/scss/scss.ts +++ b/src/basic-languages/scss/scss.ts @@ -6,7 +6,7 @@ import type { languages } from '../../fillers/monaco-editor-core'; export const conf: languages.LanguageConfiguration = { - wordPattern: /(#?-?\d*\.\d\w*%?)|([@$#!.:]?[\w-?]+%?)|[@#!.]/g, + wordPattern: /(#?-?\d*\.\d\w*%?)|([@$#!.:]?[\w?-]+%?)|[@#!.]/g, comments: { blockComment: ['/*', '*/'], lineComment: '//' diff --git a/src/basic-languages/st/st.ts b/src/basic-languages/st/st.ts index 4ddfdfb7..7b987bfb 100644 --- a/src/basic-languages/st/st.ts +++ b/src/basic-languages/st/st.ts @@ -355,12 +355,12 @@ export const language = { root: [ [/(\.\.)/, 'delimiter'], - [/\b(16#[0-9A-Fa-f\_]*)+\b/, 'number.hex'], - [/\b(2#[01\_]+)+\b/, 'number.binary'], - [/\b(8#[0-9\_]*)+\b/, 'number.octal'], + [/\b(16#[0-9A-Fa-f_]*)+\b/, 'number.hex'], + [/\b(2#[01_]+)+\b/, 'number.binary'], + [/\b(8#[0-9_]*)+\b/, 'number.octal'], [/\b\d*\.\d+([eE][\-+]?\d+)?\b/, 'number.float'], - [/\b(L?REAL)#[0-9\_\.e]+\b/, 'number.float'], - [/\b(BYTE|(?:D|L)?WORD|U?(?:S|D|L)?INT)#[0-9\_]+\b/, 'number'], + [/\b(L?REAL)#[0-9_\.e]+\b/, 'number.float'], + [/\b(BYTE|(?:D|L)?WORD|U?(?:S|D|L)?INT)#[0-9_]+\b/, 'number'], [/\d+/, 'number'], [/\b(T|DT|TOD)#[0-9:-_shmyd]+\b/, 'tag'], diff --git a/src/basic-languages/swift/swift.ts b/src/basic-languages/swift/swift.ts index 41512ab1..1880841b 100644 --- a/src/basic-languages/swift/swift.ts +++ b/src/basic-languages/swift/swift.ts @@ -204,7 +204,7 @@ export const language = { '__owned' ], - symbols: /[=(){}\[\].,:;@#\_&\-<>`?!+*\\\/]/, + symbols: /[=(){}\[\].,:;@#_&\-<>`?!+*\\\/]/, // Moved . to operatorstart so it can be a delimiter operatorstart: diff --git a/src/basic-languages/wgsl/wgsl.ts b/src/basic-languages/wgsl/wgsl.ts index ab3a4822..694a8c98 100644 --- a/src/basic-languages/wgsl/wgsl.ts +++ b/src/basic-languages/wgsl/wgsl.ts @@ -358,7 +358,7 @@ const operators = qw(` const directive_re = /enable|requires|diagnostic/; -const ident_re = /[_\p{XID_Start}]\p{XID_Continue}*/u; +const ident_re = new RegExp(`[_\\p{XID_Start}]\\p{XID_Continue}*`, 'u'); const predefined_token = 'variable.predefined'; diff --git a/src/basic-languages/xml/xml.ts b/src/basic-languages/xml/xml.ts index 016fc57c..4f61721b 100644 --- a/src/basic-languages/xml/xml.ts +++ b/src/basic-languages/xml/xml.ts @@ -23,7 +23,7 @@ export const conf: languages.LanguageConfiguration = { onEnterRules: [ { beforeText: new RegExp(`<([_:\\w][_:\\w-.\\d]*)([^/>]*(?!/)>)[^<]*$`, 'i'), - afterText: /^<\/([_:\w][_:\w-.\d]*)\s*>$/i, + afterText: /^<\/([_:\w][_:\w.\d-]*)\s*>$/i, action: { indentAction: languages.IndentAction.IndentOutdent } diff --git a/src/tsconfig.json b/src/tsconfig.json index ec06f5f3..f55524d4 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -10,5 +10,6 @@ "sourceMap": true, "allowJs": true, "checkJs": false - } + }, + "exclude": ["language/typescript/lib/typescriptServices.js"] }