Merge remote-tracking branch 'origin/master' into pr/domoritz/10

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-json",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -17,9 +17,9 @@
       "dev": true
     },
     "monaco-editor-core": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.16.1.tgz",
-      "integrity": "sha512-nydAuVbU3B1T/sNz4ZiO+92HUnLyVE4YQWr91R8WDEBItFZuwPs7Z2VaCTgouU6BwNrSnDdK/kAyhKgpih+GHQ==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.18.0.tgz",
+      "integrity": "sha512-URcHNAqH9X2JvO2skkIisAL4XAcZXxrDC8kcyr453sXQpOHUxicZpXHQb4/arXGvxrWvei3a6zZzpdT1gjeVJA==",
       "dev": true
     },
     "monaco-languages": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-json",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "JSON plugin for the Monaco Editor",
   "scripts": {
     "compile": "mrmdir ./out && tsc -p ./src/tsconfig.json && tsc -p ./src/tsconfig.esm.json",
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "jsonc-parser": "^2.0.3",
-    "monaco-editor-core": "0.16.1",
+    "monaco-editor-core": "0.18.0",
     "monaco-languages": "1.7.0",
     "monaco-plugin-helpers": "^1.0.2",
     "requirejs": "^2.3.6",

src/languageFeatures.ts

@@ -393,7 +393,8 @@ export class DocumentSymbolAdapter implements monaco.languages.DocumentSymbolPro
 				containerName: item.containerName,
 				kind: toSymbolKind(item.kind),
 				range: toRange(item.location.range),
-				selectionRange: toRange(item.location.range)
+				selectionRange: toRange(item.location.range),
+				tags: []
 			}));
 		});
 	}

src/monaco.contribution.ts

@@ -87,7 +87,7 @@ function getMode(): Promise<typeof mode> {
 
 monaco.languages.register({
 	id: 'json',
-	extensions: ['.json', '.bowerrc', '.jshintrc', '.jscsrc', '.eslintrc', '.babelrc'],
+	extensions: ['.json', '.bowerrc', '.jshintrc', '.jscsrc', '.eslintrc', '.babelrc', '.har'],
 	aliases: ['JSON', 'json'],
 	mimetypes: ['application/json'],
 });