diff --git a/extensions/clojure/syntaxes/Clojure.tmLanguage b/extensions/clojure/syntaxes/Clojure.tmLanguage index bf864640fd1..a94b2dcd1fb 100644 --- a/extensions/clojure/syntaxes/Clojure.tmLanguage +++ b/extensions/clojure/syntaxes/Clojure.tmLanguage @@ -7,6 +7,9 @@ clj cljs clojure + cljc + cljx + edn foldingStartMarker \(\s*$ diff --git a/extensions/powershell/syntaxes/PowershellSyntax.tmLanguage b/extensions/powershell/syntaxes/PowershellSyntax.tmLanguage index d9e7c46b125..fb213a2f3df 100644 --- a/extensions/powershell/syntaxes/PowershellSyntax.tmLanguage +++ b/extensions/powershell/syntaxes/PowershellSyntax.tmLanguage @@ -7,6 +7,7 @@ ps1 psm1 psd1 + ps1xml name PowerShell diff --git a/src/vs/editor/standalone-languages/csharp.ts b/src/vs/editor/standalone-languages/csharp.ts index 4e8d11d72bd..d145275864a 100644 --- a/src/vs/editor/standalone-languages/csharp.ts +++ b/src/vs/editor/standalone-languages/csharp.ts @@ -51,7 +51,7 @@ export var language = { 'internal', 'private', 'abstract', 'sealed', 'static', 'struct', 'readonly', 'volatile', 'virtual', 'override', 'params', 'get', 'set', 'add', 'remove', 'operator', 'true', 'false', 'implicit', 'explicit', 'interface', 'enum', - 'null', 'async', 'await' + 'null', 'async', 'await','fixed','sizeof','stackalloc','unsafe' ], namespaceFollows: [ diff --git a/src/vs/languages/languages.main.js b/src/vs/languages/languages.main.js index 761d6a32517..dd015518489 100644 --- a/src/vs/languages/languages.main.js +++ b/src/vs/languages/languages.main.js @@ -8,13 +8,13 @@ define([ "vs/languages/html/common/html.contribution", "vs/languages/javascript/common/javascript.contribution", "vs/languages/json/common/json.contribution", + "vs/languages/less/common/less.contribution", "vs/languages/markdown/common/markdown.contribution", "vs/languages/php/common/php.contribution", "vs/languages/plaintext/common/plaintext.contribution", "vs/languages/razor/common/razor.contribution", - "vs/languages/typescript/common/typescript.contribution", - "vs/languages/less/common/less.contribution", - "vs/languages/sass/common/sass.contribution" + "vs/languages/sass/common/sass.contribution", + "vs/languages/typescript/common/typescript.contribution" ], function() { "use strict"; }); \ No newline at end of file