Fixes Microsoft/monaco-editor#381: Align language configurations with VS Code

8 years ago · da162968ac
parent d9d2ca27bc
commit da162968ac
26 changed files with 418 additions and 198 deletions
--- a/src/bat.ts
+++ b/src/bat.ts
@ -12,24 +12,22 @@ export var conf:IRichLanguageConfiguration = {
 	comments: {
 		lineComment: 'REM'
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ open: '"', close: '"', notIn: ['string', 'comment'] },
-		{ open: '{', close: '}', notIn: ['string', 'comment'] },
-		{ open: '[', close: ']', notIn: ['string', 'comment'] },
-		{ open: '(', close: ')', notIn: ['string', 'comment'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+	],
+	surroundingPairs: [
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
 	]
-	// enhancedBrackets: [
-	// 		{
-	// 			openTrigger: 'l',
-	// 			open: /setlocal$/i,
-	// 			closeComplete: 'endlocal',
-	// 			matchCase: true,
-	// 			closeTrigger: 'l',
-	// 			close: /endlocal$/i,
-	// 			tokenType: 'keyword.tag-setlocal'
-	// 		}
-	// 	],
 };

 export var language = <ILanguage> {
--- a/src/coffee.ts
+++ b/src/coffee.ts
@ -14,13 +14,24 @@ export var conf:IRichLanguageConfiguration = {
 		blockComment: ['###', '###'],
 		lineComment: '#'
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ 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: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
 	// enhancedBrackets: [
 	// 		{ open: /for$/ }, { open: /while$/ },	{ open: /loop$/ }, { open: /if$/ }, { open: /unless$/ },
--- a/src/cpp.ts
+++ b/src/cpp.ts
@ -13,12 +13,24 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '//',
 		blockComment: ['/*', '*/'],
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')'], ['<','>']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ open: '"', close: '"', notIn: ['string', 'comment'] },
-		{ open: '{', close: '}', notIn: ['string', 'comment'] },
-		{ open: '[', close: ']', notIn: ['string', 'comment'] },
-		{ open: '(', close: ')', notIn: ['string', 'comment'] },
+		{ open: '[', close: ']' },
+		{ open: '{', close: '}' },
+		{ open: '(', close: ')' },
+		{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
+		{ open: '"', close: '"', notIn: ['string'] },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
 };

--- a/src/csharp.ts
+++ b/src/csharp.ts
@ -14,13 +14,25 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '//',
 		blockComment: ['/*', '*/'],
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')'], ['<','>']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')'],
+	],
 	autoClosingPairs: [
-		{ open: '"', close: '"', notIn: ['string', 'comment'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
 		{ 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'] },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '<', close: '>' },
+		{ open: '\'', close: '\'' },
+		{ open: '"', close: '"' },
 	]
 };

--- a/src/css.ts
+++ b/src/css.ts
@ -22,11 +22,19 @@ export var conf:LanguageConfiguration = {
 	],

 	autoClosingPairs: [
+		{ 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'] }
+	],
+
+	surroundingPairs: [
 		{ open: '{', close: '}' },
 		{ open: '[', close: ']' },
 		{ open: '(', close: ')' },
-		{ open: '"', close: '"', notIn: ['string'] },
-		{ open: '\'', close: '\'', notIn: ['string'] }
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' }
 	]
 };

--- a/src/dockerfile.ts
+++ b/src/dockerfile.ts
@ -9,14 +9,24 @@ import IRichLanguageConfiguration = monaco.languages.LanguageConfiguration;
 import ILanguage = monaco.languages.IMonarchLanguage;

 export var conf:IRichLanguageConfiguration = {
-	brackets: [['{','}'], ['[',']'], ['(',')'], ['<','>']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ 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'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
 };

--- a/src/fsharp.ts
+++ b/src/fsharp.ts
@ -13,12 +13,23 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '//',
 		blockComment: ['(*', '*)'],
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')'], ['<','>']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ open: '{', close: '}', notIn: ['string', 'comment'] },
-		{ open: '[', close: ']', notIn: ['string', 'comment'] },
-		{ open: '(', close: ')', notIn: ['string', 'comment'] },
-		{ open: '"', close: '"', notIn: ['string', 'comment'] }
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' }
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' }
 	]
 };

--- a/src/go.ts
+++ b/src/go.ts
@ -13,12 +13,26 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '//',
 		blockComment: ['/*', '*/'],
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')'], ['<','>']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ open: '{', close: '}', notIn: ['string', 'comment'] },
-		{ open: '[', close: ']', notIn: ['string', 'comment'] },
-		{ open: '(', close: ')', notIn: ['string', 'comment'] },
-		{ open: '"', close: '"', notIn: ['string', 'comment'] }
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '`', close: '`', notIn: ['string'] },
+		{ open: '"', close: '"', notIn: ['string'] },
+		{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '`', close: '`' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
 };

--- a/src/handlebars.ts
+++ b/src/handlebars.ts
@ -22,8 +22,8 @@ export var conf:IRichLanguageConfiguration = {

 	brackets: [
 		['<!--', '-->'],
-		['{{', '}}'],
 		['<', '>'],
+		['{{', '}}'],
 		['{', '}'],
 		['(', ')']
 	],
--- a/src/ini.ts
+++ b/src/ini.ts
@ -12,14 +12,24 @@ export var conf:IRichLanguageConfiguration = {
 	comments: {
 		lineComment: '#'
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')'], ['<','>']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')'],
+	],
 	autoClosingPairs: [
-		{ 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'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
 };

--- a/src/java.ts
+++ b/src/java.ts
@ -15,14 +15,25 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '//',
 		blockComment: ['/*', '*/'],
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')'], ['<','>']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')'],
+	],
 	autoClosingPairs: [
-		{ 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'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+		{ open: '<', close: '>' },
 	]
 };

--- a/src/less.ts
+++ b/src/less.ts
@ -14,14 +14,24 @@ export var conf: IRichLanguageConfiguration = {
 		blockComment: ['/*', '*/'],
 		lineComment: '//'
 	},
-    brackets: [['{','}'], ['[',']'], ['(',')'], ['<','>']],
+	brackets: [
+		['{', '}'],
+		['[', ']'],
+		['(', ')'],
+	],
 	autoClosingPairs: [
-        { 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'] },
+		{ open: '"', close: '"', notIn: ['string', 'comment'] },
+		{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
 };

--- a/src/lua.ts
+++ b/src/lua.ts
@ -13,13 +13,24 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '--',
 		blockComment: ['--[[', ']]'],
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ 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: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
 };

--- a/src/markdown.ts
+++ b/src/markdown.ts
@ -29,8 +29,22 @@ export var conf: IRichLanguageConfiguration = {
    comments: {
        blockComment: ['<!--', '-->',]
    },
-    brackets: [['{', '}'], ['[', ']'], ['(', ')'], ['<', '>']],
-    autoClosingPairs: []
+    brackets: [
+        ['{', '}'],
+        ['[', ']'],
+        ['(', ')']
+    ],
+    autoClosingPairs: [
+        { open: '{', close: '}' },
+        { open: '[', close: ']' },
+        { open: '(', close: ')' },
+        { open: '<', close: '>', notIn: [ 'string' ] }
+    ],
+    surroundingPairs: [
+        { open: '(', close: ')' },
+        { open: '[', close: ']' },
+        { open: '`', close: '`' },
+    ]
 };

 export var language = <ILanguage>{
--- a/src/objective-c.ts
+++ b/src/objective-c.ts
@ -13,14 +13,24 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '//',
 		blockComment: ['/*', '*/'],
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')'], ['<','>']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ 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'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
 };

--- a/src/php.ts
+++ b/src/php.ts
@ -23,11 +23,11 @@ export var conf:IRichLanguageConfiguration = {
 	],

 	autoClosingPairs: [
-		{ open: '{', close: '}', notIn: ['string.php'] },
-		{ open: '[', close: ']', notIn: ['string.php'] },
-		{ open: '(', close: ')', notIn: ['string.php'] },
-		{ open: '"', close: '"', notIn: ['string.php'] },
-		{ open: '\'', close: '\'', notIn: ['string.php'] }
+		{ open: '{', close: '}', notIn: ['string'] },
+		{ open: '[', close: ']', notIn: ['string'] },
+		{ open: '(', close: ')', notIn: ['string'] },
+		{ open: '"', close: '"', notIn: ['string'] },
+		{ open: '\'', close: '\'', notIn: ['string', 'comment'] }
 	]
 };

--- a/src/powershell.ts
+++ b/src/powershell.ts
@ -15,18 +15,25 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '#',
 		blockComment: ['<#', '#>'],
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ open: '{', close: '}', notIn: ['string', 'comment'] },
-		{ open: '[', close: ']', notIn: ['string', 'comment'] },
-		{ open: '(', close: ')', notIn: ['string', 'comment'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"', notIn: ['string'] },
+		{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
-	// enhancedBrackets: [
-	// 			{ tokenType:'string', openTrigger: '"', open: /@"$/, closeComplete: '"@' },
-	// 			{ tokenType:'string', openTrigger: '\'', open: /@'$/, closeComplete: '\'@' },
-	// 			{ tokenType:'string', openTrigger: '"', open: /"$/, closeComplete: '"' },
-	// 			{ tokenType: 'string', openTrigger: '\'', open: /'$/, closeComplete: '\'' }
-	// ],
 };

 export var language = <ILanguage> {
--- a/src/python.ts
+++ b/src/python.ts
@ -13,16 +13,25 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '#',
 		blockComment: ['\'\'\'', '\'\'\''],
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ open: '"', close: '"', notIn: ['string', 'comment'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"', notIn: ['string'] },
 		{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
-		{ open: '{', close: '}', notIn: ['string', 'comment'] },
-		{ open: '[', close: ']', notIn: ['string', 'comment'] },
-		{ open: '(', close: ')', notIn: ['string', 'comment'] },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
-	// Cause an automatic indent to occur after lines ending in :.
-	// enhancedBrackets: [ { open: /.*:\s*$/,  closeComplete: 'else:' } ],
 };

 export var language = <ILanguage> {
--- a/src/r.ts
+++ b/src/r.ts
@ -12,13 +12,22 @@ export var conf:IRichLanguageConfiguration = {
 	comments: {
 		lineComment: '#'
 	},
-	brackets: [['{','}'], ['[',']'], ['(',')']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ 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: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
 	]
 };

--- a/src/razor.ts
+++ b/src/razor.ts
@ -34,6 +34,7 @@ export var conf:IRichLanguageConfiguration = {
 		{ open: '"', close: '"' },
 		{ open: '\'', close: '\'' }
 	],
+
 	surroundingPairs: [
 		{ open: '"', close: '"' },
 		{ open: '\'', close: '\'' },
--- a/src/ruby.ts
+++ b/src/ruby.ts
@ -13,13 +13,24 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '#',
 		blockComment: ['=begin', '=end'],
 	},
-	brackets: [['(',')'],['{','}'], ['[',']']],
+	brackets: [
+		['(',')'],
+		['{','}'],
+		['[',']']
+	],
 	autoClosingPairs: [
-		{ 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: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
 };

--- a/src/scss.ts
+++ b/src/scss.ts
@ -14,14 +14,24 @@ export var conf: LanguageConfiguration = {
        blockComment: ['/*', '*/'],
        lineComment: '//'
    },
-    brackets: [['{', '}'], ['[', ']'], ['(', ')'], ['<', '>']],
+    brackets: [
+        ['{', '}'],
+        ['[', ']'],
+        ['(', ')']
+    ],
    autoClosingPairs: [
-        { 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'] },
+        { open: '"', close: '"', notIn: ['string', 'comment'] },
+        { open: '\'', close: '\'', notIn: ['string', 'comment'] },
+    ],
+    surroundingPairs: [
+        { open: '{', close: '}' },
+        { open: '[', close: ']' },
+        { open: '(', close: ')' },
+        { open: '"', close: '"' },
+        { open: '\'', close: '\'' },
    ]
 };

--- a/src/sql.ts
+++ b/src/sql.ts
@ -13,18 +13,25 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '--',
 		blockComment: ['/*', '*/'],
 	},
-	brackets: [['[',']'],['(',')']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ open: '"', close: '"', notIn: ['string', 'comment'] },
-		{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
-		{ open: '[', close: ']', notIn: ['string', 'comment'] },
-		{ open: '(', close: ')', notIn: ['string', 'comment'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
 	]
-	// enhancedBrackets:[
-	// 	{ openTrigger: 'n', open: /begin$/i, closeComplete: 'end', matchCase: true },
-	// 	{ openTrigger: 'e', open: /case$/i, closeComplete: 'end', matchCase: true },
-	// 	{ openTrigger: 'n', open: /when$/i, closeComplete: 'then', matchCase: true }
-	// ],
 };

 export var language = <ILanguage> {
--- a/src/swift.ts
+++ b/src/swift.ts
@ -12,14 +12,26 @@ export var conf:IRichLanguageConfiguration = {
 		lineComment: '//',
 		blockComment: ['/*', '*/'],
 	},
-	brackets: [['{','}'],['[',']'],['(',')'],['<','>']],
+	brackets: [
+		['{','}'],
+		['[',']'],
+		['(',')']
+	],
 	autoClosingPairs: [
-		{ 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'] },
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+		{ open: '`', close: '`' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+		{ open: '`', close: '`' },
 	]
 };

--- a/src/xml.ts
+++ b/src/xml.ts
@ -12,19 +12,19 @@ export var conf:IRichLanguageConfiguration = {
 	comments: {
 		blockComment: ['<!--', '-->'],
 	},
-	brackets: [['{','}'],['[',']'],['(',')'],['<','>']],
+	brackets: [
+		['<','>']
+	],
 	autoClosingPairs: [
-		{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
-		{ open: '"', close: '"', notIn: ['string', 'comment'] },
+		{ open: '<', close: '>' },
+		{ open: '\'', close: '\'' },
+		{ open: '"', close: '"' },
+	],
+	surroundingPairs: [
+		{ open: '<', close: '>' },
+		{ open: '\'', close: '\'' },
+		{ open: '"', close: '"' },
 	]
-	// enhancedBrackets: [{
-	// 	tokenType: 'tag.tag-$1.xml',
-	// 	openTrigger: '>',
-	// 	open: /<(\w[\w\d]*)([^\/>]*(?!\/)>)[^<>]*$/i,
-	// 	closeComplete: '</$1>',
-	// 	closeTrigger: '>',
-	// 	close: /<\/(\w[\w\d]*)\s*>$/i
-	// }],
 };

 export var language = <ILanguage> {
--- a/src/yaml.ts
+++ b/src/yaml.ts
@ -5,13 +5,25 @@ export const conf: IRichLanguageConfiguration = {
 	comments: {
 		lineComment: '#'
 	},
-	brackets: [['{', '}'], ['[', ']']],
+	brackets: [
+		['{', '}'],
+		['[', ']'],
+		['(', ')']
+	],
 	autoClosingPairs: [
-		{ open: '"', close: '"', notIn: ['string', 'comment'] },
-		{ open: '\'', close: '\'', notIn: ['string', 'comment'] },
-		{ open: '{', close: '}', notIn: ['string', 'comment'] },
-		{ open: '[', close: ']', notIn: ['string', 'comment'] }
-	]
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
+	surroundingPairs: [
+		{ open: '{', close: '}' },
+		{ open: '[', close: ']' },
+		{ open: '(', close: ')' },
+		{ open: '"', close: '"' },
+		{ open: '\'', close: '\'' },
+	],
 };

 export const language = <ILanguage> {