Merge branch 'master' into shobhitchittora-show-version-info-message

build/npm/update-all-grammars.js

@@ -4,9 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 const cp = require('child_process');
-const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+const fs = require('fs');
+const path = require('path');
 
 function updateGrammar(location) {
+	const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
 	const result = cp.spawnSync(npm, ['run', 'update-grammar'], {
 		cwd: location,
 		stdio: 'inherit'
@@ -17,50 +19,17 @@ function updateGrammar(location) {
 	}
 }
 
-const extensions = [
-	'bat',
-	'clojure',
-	'coffeescript',
-	'cpp',
-	'csharp',
-	'css',
-	'diff',
-	'docker',
-	'fsharp',
-	'gitsyntax',
-	'go',
-	'groovy',
-	'handlebars',
-	'hlsl',
-	'html',
-	'ini',
-	'java',
-	// 'javascript',  updated through JavaScript
-	'json',
-	'less',
-	'lua',
-	'make',
-	'markdown',
-	'objective-c',
-	'perl',
-	'php',
-	'powershell',
-	'pug',
-	'python',
-	'r',
-	'razor',
-	'ruby',
-	'rust',
-	'scss',
-	'shaderlab',
-	'shellscript',
-	'sql',
-	'swift',
-	'typescript',
-	'vb',
-	'xml',
-	'yaml'
-];
+const allExtensionFolders = fs.readdirSync('extensions');
+const extensions = allExtensionFolders.filter(e => {
+	try {
+		let packageJSON = JSON.parse(fs.readFileSync(path.join('extensions', e, 'package.json')).toString());
+		return packageJSON && packageJSON.scripts && packageJSON.scripts['update-grammar'];
+	} catch (e) {
+		return false;
+	}
+});
+
+console.log(`Updating ${extensions.length} grammars...`);
 
 extensions.forEach(extension => updateGrammar(`extensions/${extension}`));
 
@@ -70,4 +39,5 @@ if (process.platform === 'win32') {
 	cp.spawn('.\scripts\test-integration.bat', [], { env: process.env, stdio: 'inherit' });
 } else {
 	cp.spawn('/bin/bash', ['./scripts/test-integration.sh'], { env: process.env, stdio: 'inherit' });
-}
\ No newline at end of file
+}
+

extensions/clojure/syntaxes/clojure.tmLanguage.json

@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-clojure/commit/71068a45499cace7a69c45e337860ebbc9b7fccc",
+	"version": "https://github.com/atom/language-clojure/commit/ecc790326bc8e14220e4d2d72a392a30876c3219",
 	"scopeName": "source.clojure",
 	"fileTypes": [
 		"boot",
@@ -326,7 +326,7 @@
 							"include": "#dynamic-variables"
 						},
 						{
-							"match": "([\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]+)",
+							"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
 							"name": "entity.global.clojure"
 						},
 						{
@@ -404,7 +404,7 @@
 		"namespace-symbol": {
 			"patterns": [
 				{
-					"match": "([\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]+)/",
+					"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)/",
 					"captures": {
 						"1": {
 							"name": "meta.symbol.namespace.clojure"
@@ -416,7 +416,7 @@
 		"symbol": {
 			"patterns": [
 				{
-					"match": "([\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]+)",
+					"match": "([a-zA-Z\\.\\-\\_\\+\\=\\>\\<\\!\\?\\*][\\w\\.\\-\\_\\:\\+\\=\\>\\<\\!\\?\\*\\d]*)",
 					"name": "meta.symbol.clojure"
 				}
 			]

extensions/clojure/test/colorize-results/test_clj.json

@@ -199,13 +199,13 @@
 	},
 	{
 		"c": "42",
-		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure entity.global.clojure",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure constant.numeric.long.clojure",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "constant.numeric: #B5CEA8",
+			"light_plus": "constant.numeric: #09885A",
+			"dark_vs": "constant.numeric: #B5CEA8",
+			"light_vs": "constant.numeric: #09885A",
+			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
 	{
@@ -1342,7 +1342,18 @@
 		}
 	},
 	{
-		"c": "+ ",
+		"c": "+",
+		"t": "source.clojure meta.quoted-expression.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.clojure meta.quoted-expression.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -1870,7 +1881,29 @@
 		}
 	},
 	{
-		"c": " v   ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "v",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure entity.global.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "   ",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2134,7 +2167,29 @@
 		}
 	},
 	{
-		"c": " v  ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "v",
+		"t": "source.clojure meta.expression.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "  ",
 		"t": "source.clojure meta.expression.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2310,7 +2365,18 @@
 		}
 	},
 	{
-		"c": "v   ",
+		"c": "v",
+		"t": "source.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "   ",
 		"t": "source.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2431,7 +2497,29 @@
 		}
 	},
 	{
-		"c": " m ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "m",
+		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure entity.global.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2574,7 +2662,29 @@
 		}
 	},
 	{
-		"c": " m ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "m",
+		"t": "source.clojure meta.expression.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.clojure meta.expression.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2684,7 +2794,29 @@
 		}
 	},
 	{
-		"c": " m ",
+		"c": " ",
+		"t": "source.clojure meta.expression.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "m",
+		"t": "source.clojure meta.expression.clojure meta.symbol.clojure",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.clojure meta.expression.clojure",
 		"r": {
 			"dark_plus": "default: #D4D4D4",

extensions/cpp/build/update-grammars.js

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+var updateGrammar = require('../../../build/npm/update-grammar');
+
+updateGrammar.update('atom/language-c', 'grammars/c.cson', './syntaxes/c.tmLanguage.json');
+updateGrammar.update('atom/language-c', 'grammars/c%2B%2B.cson', './syntaxes/cpp.tmLanguage.json');
+
+// `source.c.platform` which is still included by other grammars
+updateGrammar.update('textmate/c.tmbundle', 'Syntaxes/Platform.tmLanguage', './syntaxes/platform.tmLanguage.json');
+

extensions/cpp/package.json

@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-c grammars/c.cson ./syntaxes/c.json grammars/c%2B%2B.cson ./syntaxes/c++.json"
+		"update-grammar": "node ./build/update-grammars.js"
 	},
 	"contributes": {
 		"languages": [{
@@ -22,16 +22,16 @@
 		"grammars": [{
 			"language": "c",
 			"scopeName": "source.c",
-			"path": "./syntaxes/c.json"
+			"path": "./syntaxes/c.tmLanguage.json"
 		},
 		{
 			"language": "cpp",
 			"scopeName": "source.cpp",
-			"path": "./syntaxes/c++.json"
+			"path": "./syntaxes/cpp.tmLanguage.json"
 		},
 		{
 			"scopeName": "source.c.platform",
-			"path": "./syntaxes/Platform.tmLanguage"
+			"path": "./syntaxes/platform.tmLanguage.json"
 		}],
 		"snippets": [{
 			"language": "c",

extensions/fsharp/package.json

@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js ionide/ionide-fsgrammar grammar/fsharp.json ./syntaxes/fsharp.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js ionide/ionide-fsgrammar grammar/fsharp.json ./syntaxes/fsharp.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -16,7 +16,7 @@
 		"grammars": [{
 			"language": "fsharp",
 			"scopeName": "source.fsharp",
-			"path": "./syntaxes/fsharp.json"
+			"path": "./syntaxes/fsharp.tmLanguage.json"
 		}],
 		"snippets": [{
 			"language": "fsharp",

extensions/go/package.json

@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-go grammars/go.cson ./syntaxes/go.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-go grammars/go.cson ./syntaxes/go.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -16,7 +16,7 @@
 		"grammars": [{
 			"language": "go",
 			"scopeName": "source.go",
-			"path": "./syntaxes/go.json"
+			"path": "./syntaxes/go.tmLanguage.json"
 		}],
 		"configurationDefaults": {
 			"[go]": {

extensions/hlsl/package.json

@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js tgjones/shaders-tmLanguage grammars/hlsl.json ./syntaxes/hlsl.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js tgjones/shaders-tmLanguage grammars/hlsl.json ./syntaxes/hlsl.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -15,7 +15,7 @@
 		}],
 		"grammars": [{
 			"language": "hlsl",
-			"path": "./syntaxes/hlsl.json",
+			"path": "./syntaxes/hlsl.tmLanguage.json",
 			"scopeName":"source.hlsl"
 		}]
 	}

extensions/html/package.json

@@ -16,7 +16,7 @@
   "scripts": {
     "compile": "gulp compile-extension:html-client && gulp compile-extension:html-server",
     "postinstall": "cd server && yarn install",
-    "update-grammar": "node ../../build/npm/update-grammar.js textmate/html.tmbundle Syntaxes/HTML.plist ./syntaxes/html.json",
+    "update-grammar": "node ../../build/npm/update-grammar.js textmate/html.tmbundle Syntaxes/HTML.plist ./syntaxes/html.tmLanguage.json",
     "install-client-next": "yarn add vscode-languageclient@next"
   },
   "contributes": {
@@ -57,7 +57,7 @@
       {
         "language": "html",
         "scopeName": "text.html.basic",
-        "path": "./syntaxes/html.json",
+        "path": "./syntaxes/html.tmLanguage.json",
         "embeddedLanguages": {
           "text.html": "html",
           "source.css": "css",

extensions/java/syntaxes/java.tmLanguage.json

@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-java/commit/cf96ae95ea2e2f4cfd5e6e685e6d7db039859cc6",
+	"version": "https://github.com/atom/language-java/commit/5c2863da1425d61914d2e04ef31b86f8c5883c5f",
 	"scopeName": "source.java",
 	"name": "Java",
 	"fileTypes": [
@@ -36,9 +36,13 @@
 					"name": "invalid.illegal.character_not_allowed_here.java"
 				},
 				{
-					"match": "(?<!_)_(?=\\s*(\\.|;))|[A-Z]+|\\b\\d+|-+",
+					"match": "(?<!_)_(?=\\s*(\\.|;))|\\b\\d+|-+",
 					"name": "invalid.illegal.character_not_allowed_here.java"
 				},
+				{
+					"match": "[A-Z]+",
+					"name": "invalid.deprecated.package_name_not_lowercase.java"
+				},
 				{
 					"match": "(?x)\\b(?<!\\$)\n(abstract|assert|boolean|break|byte|case|catch|char|class|\nconst|continue|default|do|double|else|enum|extends|final|\nfinally|float|for|goto|if|implements|import|instanceof|int|\ninterface|long|native|new|package|private|protected|public|\nreturn|short|static|strictfp|super|switch|syncronized|this|\nthrow|throws|transient|try|void|volatile|while|\ntrue|false|null)\\b",
 					"name": "invalid.illegal.character_not_allowed_here.java"
@@ -533,7 +537,7 @@
 		"comments-javadoc": {
 			"patterns": [
 				{
-					"begin": "^\\s*/\\*\\*",
+					"begin": "^\\s*/\\*\\*(?!/)",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.comment.java"
@@ -675,6 +679,9 @@
 							},
 							"contentName": "meta.catch.parameters.java",
 							"patterns": [
+								{
+									"include": "#comments"
+								},
 								{
 									"include": "#parameters"
 								}
@@ -773,6 +780,9 @@
 						}
 					}
 				},
+				{
+					"include": "#primitive-arrays"
+				},
 				{
 					"match": "[a-zA-Z$_][a-zA-Z0-9$_]*",
 					"name": "storage.type.generic.java"
@@ -1389,6 +1399,12 @@
 				},
 				{
 					"include": "#variables"
+				},
+				{
+					"include": "#primitive-arrays"
+				},
+				{
+					"include": "#object-types"
 				}
 			]
 		}

extensions/json/server/src/languageModelCache.ts

@@ -16,7 +16,7 @@ export function getLanguageModelCache<T>(maxEntries: number, cleanupIntervalTime
 	let languageModels: { [uri: string]: { version: number, languageId: string, cTime: number, languageModel: T } } = {};
 	let nModels = 0;
 
-	let cleanupInterval = void 0;
+	let cleanupInterval: NodeJS.Timer | undefined = void 0;
 	if (cleanupIntervalTimeInSec > 0) {
 		cleanupInterval = setInterval(() => {
 			let cutoffTime = Date.now() - cleanupIntervalTimeInSec * 1000;

extensions/log/syntaxes/log.tmLanguage.json

@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/3f3ea0a69165bc95f62bb487fda73e925ae229a6",
+	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/8196aa2cc8dd9b1eda431203857e5317866facec",
 	"scopeName": "text.log",
 	"fileTypes": [
 		"log"
@@ -52,9 +52,13 @@
 			"name": "comment log.date"
 		},
 		{
-			"match": "\\d{2}:\\d{2}(:\\d{2}([.,]\\d{3,6})?)?(Z| ?[+-]\\d{2}:\\d{2})?\\b",
+			"match": "\\d{2}:\\d{2}(:\\d{2}([.,]\\d{3,})?)?(Z| ?[+-]\\d{2}:\\d{2})?\\b",
 			"name": "comment log.date"
 		},
+		{
+			"match": "\\b([0-9a-fA-F]{40}|[0-9a-fA-F]{10}|[0-9a-fA-F]{7})\\b",
+			"name": "constant.language"
+		},
 		{
 			"match": "[0-9a-fA-F]{8}[-]?([0-9a-fA-F]{4}[-]?){3}[0-9a-fA-F]{12}",
 			"name": "constant.language log.constant"
@@ -73,7 +77,7 @@
 		},
 		{
 			"match": "\\b([a-zA-Z.]*Exception)\\b",
-			"name": "string.regexp, emphasis log.type"
+			"name": "string.regexp, emphasis log.exceptiontype"
 		},
 		{
 			"begin": "^[\\t ]*at",
@@ -84,6 +88,10 @@
 			"match": "\\b(http|https|ftp|file)://\\S+\\b/?",
 			"name": "constant.language log.constant"
 		},
+		{
+			"match": "(([A-Za-z]\\:(\\\\|/))|(\\.(\\\\|/))|(\\.\\.(\\\\|/)){1,}|(\\\\\\\\|//)[\\w -]+(\\\\|/))([\\w -]+(\\\\|/))*",
+			"name": "constant.language log.constant"
+		},
 		{
 			"match": "\\b([\\w]+\\.)+(\\w)+\\b",
 			"name": "constant.language log.constant"

extensions/lua/package.json

@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js textmate/lua.tmbundle Syntaxes/Lua.plist ./syntaxes/lua.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js textmate/lua.tmbundle Syntaxes/Lua.plist ./syntaxes/lua.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -16,7 +16,7 @@
 		"grammars": [{
 			"language": "lua",
 			"scopeName": "source.lua",
-			"path": "./syntaxes/lua.json"
+			"path": "./syntaxes/lua.tmLanguage.json"
 		}]
 	}
 }
\ No newline at end of file

extensions/make/package.json

@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js fadeevab/make.tmbundle Syntaxes/Makefile.plist ./syntaxes/Makefile.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js fadeevab/make.tmbundle Syntaxes/Makefile.plist ./syntaxes/make.tmLanguage.json"
 	},
 	"contributes": {
 
@@ -19,7 +19,7 @@
 		"grammars": [{
 			"language": "makefile",
 			"scopeName": "source.makefile",
-			"path": "./syntaxes/Makefile.json"
+			"path": "./syntaxes/make.tmLanguage.json"
 		}],
 		"configurationDefaults": {
 			"[makefile]": {

extensions/powershell/language-configuration.json

@@ -14,7 +14,8 @@
 		["(", ")"],
 		{ "open": "\"", "close": "\"", "notIn": ["string"]},
 		{ "open": "'", "close": "'", "notIn": ["string", "comment"]},
-		["/**", " */"]
+		["/**", " */"],
+		["<#", "#>"]
 	],
 	"surroundingPairs": [
 		["{", "}"],

extensions/razor/package.json

@@ -6,7 +6,7 @@
     "vscode": "0.10.x"
   },
   "scripts": {
-    "update-grammar": "node ../../build/npm/update-grammar.js demyte/language-cshtml grammars/cshtml.json ./syntaxes/cshtml.json"
+    "update-grammar": "node ../../build/npm/update-grammar.js demyte/language-cshtml grammars/cshtml.json ./syntaxes/cshtml.tmLanguage.json"
   },
 	"contributes": {
 		"languages": [{
@@ -19,7 +19,7 @@
 		"grammars": [{
       "language": "razor",
 			"scopeName": "text.html.cshtml",
-			"path": "./syntaxes/cshtml.json",
+			"path": "./syntaxes/cshtml.tmLanguage.json",
 			"embeddedLanguages": {
 				"section.embedded.source.cshtml": "csharp"
 			}

extensions/scss/package.json

@@ -4,7 +4,7 @@
     "publisher": "vscode",
     "engines": { "vscode": "*" },
     "scripts": {
-        "update-grammar": "node ../../build/npm/update-grammar.js atom/language-sass grammars/scss.cson ./syntaxes/scss.json"
+        "update-grammar": "node ../../build/npm/update-grammar.js atom/language-sass grammars/scss.cson ./syntaxes/scss.tmLanguage.json"
     },
     "contributes": {
         "languages": [{
@@ -17,7 +17,7 @@
         "grammars": [{
             "language": "scss",
             "scopeName": "source.css.scss",
-            "path": "./syntaxes/scss.json"
+            "path": "./syntaxes/scss.tmLanguage.json"
         }],
         "problemMatchers": [{
             "name": "node-sass",

extensions/shaderlab/package.json

@@ -6,7 +6,7 @@
 		"vscode": "*"
 	},
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js tgjones/shaders-tmLanguage grammars/shaderlab.json ./syntaxes/shaderlab.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js tgjones/shaders-tmLanguage grammars/shaderlab.json ./syntaxes/shaderlab.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [
@@ -25,7 +25,7 @@
 		"grammars": [
 			{
 				"language": "shaderlab",
-				"path": "./syntaxes/shaderlab.json",
+				"path": "./syntaxes/shaderlab.tmLanguage.json",
 				"scopeName": "source.shaderlab"
 			}
 		]

extensions/sql/test/colorize-results/test_sql.json

@@ -11,7 +11,29 @@
 		}
 	},
 	{
-		"c": " VIEW METRIC_STATS (ID, MONTH, TEMP_C, RAIN_C) ",
+		"c": " VIEW METRIC_STATS (ID, ",
+		"t": "source.sql",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "MONTH",
+		"t": "source.sql support.function.datetime.sql",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.function: #DCDCAA"
+		}
+	},
+	{
+		"c": ", TEMP_C, RAIN_C) ",
 		"t": "source.sql",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -55,7 +77,18 @@
 		}
 	},
 	{
-		"c": "MONTH,",
+		"c": "MONTH",
+		"t": "source.sql support.function.datetime.sql",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.function: #DCDCAA"
+		}
+	},
+	{
+		"c": ",",
 		"t": "source.sql",
 		"r": {
 			"dark_plus": "default: #D4D4D4",

extensions/xml/package.json

@@ -80,14 +80,14 @@
 		"grammars": [{
 			"language": "xml",
 			"scopeName": "text.xml",
-			"path": "./syntaxes/xml.json"
+			"path": "./syntaxes/xml.tmLanguage.json"
 		}, {
 			"language": "xsl",
 			"scopeName": "text.xml.xsl",
-			"path": "./syntaxes/xsl.json"
+			"path": "./syntaxes/xsl.tmLanguage.json"
 		}]
 	},
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-xml grammars/xml.cson ./syntaxes/xml.json grammars/xsl.cson ./syntaxes/xsl.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-xml grammars/xml.cson ./syntaxes/xml.tmLanguage.json grammars/xsl.cson ./syntaxes/xsl.tmLanguage.json"
 	}
 }

extensions/yaml/package.json

@@ -4,7 +4,7 @@
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.tmLanguage.json"
 	},
 	"contributes": {
 		"languages": [{
@@ -18,7 +18,7 @@
 		"grammars": [{
 			"language": "yaml",
 			"scopeName": "source.yaml",
-			"path": "./syntaxes/yaml.json"
+			"path": "./syntaxes/yaml.tmLanguage.json"
 		}],
 		"configurationDefaults": {
 			"[yaml]": {

src/vs/workbench/browser/dnd.ts

@@ -162,8 +162,8 @@ export class ResourcesDropHandler {
 	}
 
 	public handleDrop(event: DragEvent, afterDrop: () => void, targetPosition: Position, targetIndex?: number): void {
-		const resources = extractResources(event).filter(r => r.resource.scheme === Schemas.file || r.resource.scheme === Schemas.untitled);
-		if (!resources.length) {
+		const untitledOrFileResources = extractResources(event).filter(r => this.fileService.canHandleResource(r.resource) || r.resource.scheme === Schemas.untitled);
+		if (!untitledOrFileResources.length) {
 			return;
 		}
 
@@ -171,26 +171,26 @@ export class ResourcesDropHandler {
 		return this.windowService.focusWindow().then(() => {
 
 			// Check for special things being dropped
-			return this.doHandleDrop(resources).then(isWorkspaceOpening => {
+			return this.doHandleDrop(untitledOrFileResources).then(isWorkspaceOpening => {
 				if (isWorkspaceOpening) {
 					return void 0; // return early if the drop operation resulted in this window changing to a workspace
 				}
 
 				// Add external ones to recently open list unless dropped resource is a workspace
-				const externalResources = resources.filter(d => d.isExternal).map(d => d.resource);
-				if (externalResources.length) {
-					this.windowsService.addRecentlyOpened(externalResources.map(resource => resource.fsPath));
+				const resourcesToAddToHistory = untitledOrFileResources.filter(d => d.isExternal && d.resource.scheme !== Schemas.untitled).map(d => d.resource);
+				if (resourcesToAddToHistory.length) {
+					this.windowsService.addRecentlyOpened(resourcesToAddToHistory.map(resource => resource.fsPath));
 				}
 
 				// Open in Editor
-				return this.editorService.openEditors(resources.map(r => {
+				return this.editorService.openEditors(untitledOrFileResources.map(untitledOrFileResource => {
 					return {
 						input: {
-							resource: r.resource,
+							resource: untitledOrFileResource.resource,
 							options: {
 								pinned: true,
 								index: targetIndex,
-								viewState: (r as IDraggedEditor).viewState
+								viewState: (untitledOrFileResource as IDraggedEditor).viewState
 							}
 						},
 						position: targetPosition
@@ -204,17 +204,20 @@ export class ResourcesDropHandler {
 		}).done(null, onUnexpectedError);
 	}
 
-	private doHandleDrop(resources: (IDraggedResource | IDraggedEditor)[]): TPromise<boolean> {
+	private doHandleDrop(untitledOrFileResources: (IDraggedResource | IDraggedEditor)[]): TPromise<boolean> {
 
 		// Check for dirty editors being dropped
-		const resourcesWithBackups: IDraggedEditor[] = resources.filter(resource => !resource.isExternal && !!(resource as IDraggedEditor).backupResource);
+		const resourcesWithBackups: IDraggedEditor[] = untitledOrFileResources.filter(resource => !resource.isExternal && !!(resource as IDraggedEditor).backupResource);
 		if (resourcesWithBackups.length > 0) {
 			return TPromise.join(resourcesWithBackups.map(resourceWithBackup => this.handleDirtyEditorDrop(resourceWithBackup))).then(() => false);
 		}
 
 		// Check for workspace file being dropped if we are allowed to do so
-		if (this.options.allowWorkspaceOpen && resources.some(r => r.isExternal)) {
-			return this.handleWorkspaceFileDrop(resources);
+		if (this.options.allowWorkspaceOpen) {
+			const externalFileOnDiskResources = untitledOrFileResources.filter(d => d.isExternal && d.resource.scheme === Schemas.file).map(d => d.resource);
+			if (externalFileOnDiskResources.length > 0) {
+				return this.handleWorkspaceFileDrop(externalFileOnDiskResources);
+			}
 		}
 
 		return TPromise.as(false);
@@ -249,31 +252,29 @@ export class ResourcesDropHandler {
 		return DefaultEndOfLine.LF;
 	}
 
-	private handleWorkspaceFileDrop(resources: (IDraggedResource | IDraggedEditor)[]): TPromise<boolean> {
-		const externalResources = resources.filter(d => d.isExternal).map(d => d.resource);
-
-		const externalWorkspaceResources: { workspaces: URI[], folders: URI[] } = {
+	private handleWorkspaceFileDrop(fileOnDiskResources: URI[]): TPromise<boolean> {
+		const workspaceResources: { workspaces: URI[], folders: URI[] } = {
 			workspaces: [],
 			folders: []
 		};
 
-		return TPromise.join(externalResources.map(resource => {
+		return TPromise.join(fileOnDiskResources.map(fileOnDiskResource => {
 
 			// Check for Workspace
-			if (extname(resource.fsPath) === `.${WORKSPACE_EXTENSION}`) {
-				externalWorkspaceResources.workspaces.push(resource);
+			if (extname(fileOnDiskResource.fsPath) === `.${WORKSPACE_EXTENSION}`) {
+				workspaceResources.workspaces.push(fileOnDiskResource);
 
 				return void 0;
 			}
 
 			// Check for Folder
-			return this.fileService.resolveFile(resource).then(stat => {
+			return this.fileService.resolveFile(fileOnDiskResource).then(stat => {
 				if (stat.isDirectory) {
-					externalWorkspaceResources.folders.push(stat.resource);
+					workspaceResources.folders.push(stat.resource);
 				}
 			}, error => void 0);
 		})).then(_ => {
-			const { workspaces, folders } = externalWorkspaceResources;
+			const { workspaces, folders } = workspaceResources;
 
 			// Return early if no external resource is a folder or workspace
 			if (workspaces.length === 0 && folders.length === 0) {