Adopt latest monaco-editor-core

pull/2748/head
Alex Dima 8 years ago
parent 6882a78485
commit a75676a7e9

@ -26,7 +26,7 @@
"jsdom-no-contextify": "^3.1.0", "jsdom-no-contextify": "^3.1.0",
"merge-stream": "^1.0.0", "merge-stream": "^1.0.0",
"mocha": "^2.5.3", "mocha": "^2.5.3",
"monaco-editor-core": "^0.7.0", "monaco-editor-core": "^0.8.0",
"object-assign": "^4.1.0", "object-assign": "^4.1.0",
"rimraf": "^2.5.2", "rimraf": "^2.5.2",
"typescript": "2.0.3" "typescript": "2.0.3"

@ -17,18 +17,17 @@ export var conf:IRichLanguageConfiguration = {
wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g, wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g,
comments: { comments: {
blockComment: ['<!--', '-->'] blockComment: ['{{!--', '--}}']
}, },
brackets: [ brackets: [
['<!--', '-->'], ['<!--', '-->'],
['{{', '}}'] ['{{', '}}'],
['<', '>'],
['{', '}'],
['(', ')']
], ],
__electricCharacterSupport: {
embeddedElectricCharacters: ['*', '}', ']', ')']
},
autoClosingPairs: [ autoClosingPairs: [
{ open: '{', close: '}' }, { open: '{', close: '}' },
{ open: '[', close: ']' }, { open: '[', close: ']' },

@ -23,12 +23,10 @@ export var conf:IRichLanguageConfiguration = {
brackets: [ brackets: [
['<!--', '-->'], ['<!--', '-->'],
['<', '>'], ['<', '>'],
['{', '}'],
['(', ')']
], ],
__electricCharacterSupport: {
embeddedElectricCharacters: ['*', '}', ']', ')']
},
autoClosingPairs: [ autoClosingPairs: [
{ open: '{', close: '}' }, { open: '{', close: '}' },
{ open: '[', close: ']' }, { open: '[', close: ']' },
@ -39,7 +37,11 @@ export var conf:IRichLanguageConfiguration = {
surroundingPairs: [ surroundingPairs: [
{ open: '"', close: '"' }, { open: '"', close: '"' },
{ open: '\'', close: '\'' } { open: '\'', close: '\'' },
{ open: '{', close: '}' },
{ open: '[', close: ']' },
{ open: '(', close: ')' },
{ open: '<', close: '>' },
], ],
onEnterRules: [ onEnterRules: [

@ -22,14 +22,11 @@ export var conf:IRichLanguageConfiguration = {
brackets: [ brackets: [
['<!--', '-->'], ['<!--', '-->'],
['<', '>'],
['{', '}'], ['{', '}'],
['(', ')'] ['(', ')']
], ],
__electricCharacterSupport: {
embeddedElectricCharacters: ['*', '}', ']', ')']
},
autoClosingPairs: [ autoClosingPairs: [
{ open: '{', close: '}' }, { open: '{', close: '}' },
{ open: '[', close: ']' }, { open: '[', close: ']' },
@ -39,7 +36,8 @@ export var conf:IRichLanguageConfiguration = {
], ],
surroundingPairs: [ surroundingPairs: [
{ open: '"', close: '"' }, { open: '"', close: '"' },
{ open: '\'', close: '\'' } { open: '\'', close: '\'' },
{ open: '<', close: '>' }
], ],
onEnterRules: [ onEnterRules: [

@ -20,11 +20,7 @@ export var conf:IRichLanguageConfiguration = {
{ open: '(', close: ')', notIn: ['string', 'comment'] }, { open: '(', close: ')', notIn: ['string', 'comment'] },
{ open: '{', close: '}', notIn: ['string', 'comment'] }, { open: '{', close: '}', notIn: ['string', 'comment'] },
{ open: '[', close: ']', notIn: ['string', 'comment'] }, { open: '[', close: ']', notIn: ['string', 'comment'] },
], ]
__electricCharacterSupport: {
// trigger outdenting on 'end'
embeddedElectricCharacters: ['d']
}
}; };
/* /*

Loading…
Cancel
Save