SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 09:20:10 +01:00
Code Issues Projects Releases Packages Activity

Merge branch 'main' into feature/json_docsym

Browse source
This commit is contained in:
Martin Aeschlimann 2023-12-15 10:30:42 +01:00 • committed by GitHub
commit 84a181bb6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 677 additions and 581 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/basic-languages/cpp/cpp.ts
View file

@ -259,7 +259,6 @@ export const language = <languages.IMonarchLanguage>{
'%',
'<<',
'>>',
'>>>',
'+=',
'-=',
'*=',
@ -269,8 +268,7 @@ export const language = <languages.IMonarchLanguage>{
'^=',
'%=',
'<<=',
'>>=',
'>>>='
'>>='
],
// we include these common regular expressions
@ -312,8 +310,7 @@ export const language = <languages.IMonarchLanguage>{
// [[ attributes ]].
[/\[\s*\[/, { token: 'annotation', next: '@annotation' }],
// delimiters and operators
[/[{}()\[\]]/, '@brackets'],
[/[<>](?!@symbols)/, '@brackets'],
[/[{}()<>\[\]]/, '@brackets'],
[
/@symbols/,
{

1
src/basic-languages/python/python.ts
View file

@ -93,6 +93,7 @@ export const language = <languages.IMonarchLanguage>{
'raise',
'return',
'try',
'type', // new in Python 3.12
'while',
'with',
'yield',

5
src/language/json/jsonWorker.ts
View file

@ -32,7 +32,10 @@ export class JSONWorker {
return resolvePath(base, relativePath);
}
},
schemaRequestService: createData.enableSchemaRequest ? defaultSchemaRequestService : undefined
schemaRequestService: createData.enableSchemaRequest
? defaultSchemaRequestService
: undefined,
clientCapabilities: jsonService.ClientCapabilities.LATEST
});
this._languageService.configure(this._languageSettings);
}