[json] update service (folding api for #47808)

microsoft · Apr 16, 2018 · 6c22305 · 6c22305
1 parent d516e62
commit 6c22305
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 269 deletions.
diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "jsonc-parser": "^2.0.0-next.1",
     "request-light": "^0.2.2",
-    "vscode-json-languageservice": "^3.0.13",
+    "vscode-json-languageservice": "^3.1.2-next.1",
     "vscode-languageserver": "^4.0.0",
     "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
     "vscode-nls": "^3.2.2",
@@ -33,7 +33,6 @@
     "install-service-local": "yarn link vscode-json-languageservice",
     "install-server-next": "yarn add vscode-languageserver@next",
     "install-server-local": "yarn link vscode-languageserver-server",
-    "test": "npm run compile && ../../../node_modules/.bin/mocha",
     "version": "git commit -m \"JSON Language Server $npm_package_version\" package.json"
   }
 }
diff --git a/extensions/json-language-features/server/src/jsonFolding.ts b/extensions/json-language-features/server/src/jsonFolding.ts
diff --git a/extensions/json-language-features/server/src/jsonServerMain.ts b/extensions/json-language-features/server/src/jsonServerMain.ts
@@ -18,7 +18,6 @@ import { startsWith } from './utils/strings';
 import { formatError, runSafe, runSafeAsync } from './utils/runner';
 import { JSONDocument, JSONSchema, getLanguageService, DocumentLanguageSettings, SchemaConfiguration } from 'vscode-json-languageservice';
 import { getLanguageModelCache } from './languageModelCache';
-import { getFoldingRegions } from './jsonFolding';
 
 import { FoldingRangesRequest, FoldingProviderServerCapabilities } from 'vscode-languageserver-protocol-foldingprovider';
 
@@ -369,7 +368,7 @@ connection.onRequest(FoldingRangesRequest.type, (params, token) => {
 	return runSafe(() => {
 		let document = documents.get(params.textDocument.uri);
 		if (document) {
-			return getFoldingRegions(document, params.maxRanges, token);
+			return languageService.getFoldingRanges(document, { maxRanges: params.maxRanges });
 		}
 		return null;
 	}, null, `Error while computing folding ranges for ${params.textDocument.uri}`, token);

diff --git a/extensions/json-language-features/server/src/test/folding.test.ts b/extensions/json-language-features/server/src/test/folding.test.ts
diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock
@@ -52,6 +52,10 @@ https-proxy-agent@2.1.1:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
+jsonc-parser@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.0.tgz#62ff087a7e753875febf3c55f1fc0cd737c36b5a"
+
 jsonc-parser@^2.0.0-next.1:
   version "2.0.0-next.1"
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.0-next.1.tgz#445a824f765a96abfbb286d759a9b1d226b18088"
@@ -68,11 +72,11 @@ request-light@^0.2.2:
     https-proxy-agent "2.1.1"
     vscode-nls "^2.0.2"
 
-vscode-json-languageservice@^3.0.13:
-  version "3.0.13"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.0.13.tgz#dd1b7ddfd4f5ca16e2a7adcc7d7f9009ac02319a"
+vscode-json-languageservice@^3.1.2-next.1:
+  version "3.1.2-next.1"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.2-next.1.tgz#8acee581c664e2af72ade2f08252aeae9b5918ca"
   dependencies:
-    jsonc-parser "^2.0.0-next.1"
+    jsonc-parser "^2.0.0"
     vscode-languageserver-types "^3.6.1"
     vscode-nls "^3.2.1"
     vscode-uri "^1.0.3"