SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 19:42:56 +01:00
Code Issues Projects Releases Packages Activity

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

Browse source
This commit is contained in:
Alex Dima 2019-09-19 10:18:10 +02:00
commit 5300c90f58
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
package-lock.json generated
View file

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

4
package.json
View file

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

3
src/languageFeatures.ts
View file

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

2
src/monaco.contribution.ts
View file

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