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

Use the global monaco only in the AMD case (see microsoft/monaco-editor#1974)

Browse source
This commit is contained in:
Alex Dima 2020-09-08 13:40:42 +02:00
parent 1af07d9cdb
commit d7cc098c48
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
80 changed files with 347 additions and 387 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/typescript/typescript.ts
View file

@ -3,14 +3,9 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
import ILanguage = monaco.languages.IMonarchLanguage;
import { languages } from '../fillers/monaco-editor-core';
// Allow for running under nodejs/requirejs in tests
const _monaco: typeof monaco =
typeof monaco === 'undefined' ? (<any>self).monaco : monaco;
export const conf: IRichLanguageConfiguration = {
export const conf: languages.LanguageConfiguration = {
wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
comments: {
@ -30,7 +25,7 @@ export const conf: IRichLanguageConfiguration = {
beforeText: /^\s*\/\*\*(?!\/)([^\*]|\*(?!\/))*$/,
afterText: /^\s*\*\/$/,
action: {
indentAction: _monaco.languages.IndentAction.IndentOutdent,
indentAction: languages.IndentAction.IndentOutdent,
appendText: ' * '
}
},
@ -38,7 +33,7 @@ export const conf: IRichLanguageConfiguration = {
// e.g. /** ...|
beforeText: /^\s*\/\*\*(?!\/)([^\*]|\*(?!\/))*$/,
action: {
indentAction: _monaco.languages.IndentAction.None,
indentAction: languages.IndentAction.None,
appendText: ' * '
}
},
@ -46,7 +41,7 @@ export const conf: IRichLanguageConfiguration = {
// e.g. * ...|
beforeText: /^(\t|(\ \ ))*\ \*(\ ([^\*]|\*(?!\/))*)?$/,
action: {
indentAction: _monaco.languages.IndentAction.None,
indentAction: languages.IndentAction.None,
appendText: '* '
}
},
@ -54,7 +49,7 @@ export const conf: IRichLanguageConfiguration = {
// e.g. */|
beforeText: /^(\t|(\ \ ))*\ \*\/\s*$/,
action: {
indentAction: _monaco.languages.IndentAction.None,
indentAction: languages.IndentAction.None,
removeText: 1
}
}