volar-service-json 0.0.47 → 0.0.49

package/index.d.ts

@@ -1,4 +1,4 @@
-import type { LanguageServicePlugin, DocumentSelector, ServiceContext, Disposable, ProviderResult, FormattingOptions } from '@volar/language-service';
+import type { LanguageServicePlugin, DocumentSelector, LanguageServiceContext, Disposable, ProviderResult, FormattingOptions } from '@volar/language-service';
 import * as json from 'vscode-json-languageservice';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 export interface Provide {
@@ -13,11 +13,11 @@ export interface JSONSchemaSettings {
 }
 export declare function create({ documentSelector, getWorkspaceContextService, isFormattingEnabled, getFormattingOptions, getLanguageSettings, getDocumentLanguageSettings, onDidChangeLanguageSettings, }?: {
     documentSelector?: DocumentSelector;
-    getWorkspaceContextService?(context: ServiceContext): json.WorkspaceContextService;
-    isFormattingEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
-    getFormattingOptions?(document: TextDocument, options: FormattingOptions, context: ServiceContext): ProviderResult<json.FormattingOptions>;
-    getLanguageSettings?(context: ServiceContext): ProviderResult<json.LanguageSettings>;
-    getDocumentLanguageSettings?(document: TextDocument, context: ServiceContext): ProviderResult<json.DocumentLanguageSettings | undefined>;
-    onDidChangeLanguageSettings?(listener: () => void, context: ServiceContext): Disposable;
+    getWorkspaceContextService?(context: LanguageServiceContext): json.WorkspaceContextService;
+    isFormattingEnabled?(document: TextDocument, context: LanguageServiceContext): ProviderResult<boolean>;
+    getFormattingOptions?(document: TextDocument, options: FormattingOptions, context: LanguageServiceContext): ProviderResult<json.FormattingOptions>;
+    getLanguageSettings?(context: LanguageServiceContext): ProviderResult<json.LanguageSettings>;
+    getDocumentLanguageSettings?(document: TextDocument, context: LanguageServiceContext): ProviderResult<json.DocumentLanguageSettings | undefined>;
+    onDidChangeLanguageSettings?(listener: () => void, context: LanguageServiceContext): Disposable;
 }): LanguageServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -6,12 +6,13 @@ const vscode_uri_1 = require("vscode-uri");
 function create({ documentSelector = ['json', 'jsonc'], getWorkspaceContextService = context => {
     return {
         resolveRelativePath(relativePath, resource) {
-            const decoded = context.decodeEmbeddedDocumentUri(resource);
+            const base = resource.substring(0, resource.lastIndexOf('/') + 1);
+            let baseUri = vscode_uri_1.URI.parse(base);
+            const decoded = context.decodeEmbeddedDocumentUri(baseUri);
             if (decoded) {
-                resource = decoded[0];
+                baseUri = decoded[0];
             }
-            const base = resource.substring(0, resource.lastIndexOf('/') + 1);
-            return vscode_uri_1.Utils.resolvePath(vscode_uri_1.URI.parse(base), relativePath).toString();
+            return vscode_uri_1.Utils.resolvePath(baseUri, relativePath).toString();
         },
     };
 }, isFormattingEnabled = async (_document, context) => {
@@ -51,12 +52,26 @@ function create({ documentSelector = ['json', 'jsonc'], getWorkspaceContextServi
 }, } = {}) {
     return {
         name: 'json',
-        // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/json-language-features/server/src/jsonServer.ts#L150
-        triggerCharacters: ['"', ':'],
+        capabilities: {
+            completionProvider: {
+                // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/json-language-features/server/src/jsonServer.ts#L150
+                triggerCharacters: ['"', ':'],
+                resolveProvider: true,
+            },
+            definitionProvider: true,
+            diagnosticProvider: true,
+            hoverProvider: true,
+            documentLinkProvider: {},
+            documentSymbolProvider: true,
+            colorProvider: true,
+            foldingRangeProvider: true,
+            selectionRangeProvider: true,
+            documentFormattingProvider: true,
+        },
         create(context) {
             const jsonDocuments = new WeakMap();
             const jsonLs = json.getLanguageService({
-                schemaRequestService: async (uri) => await context.env.fs?.readFile(uri) ?? '',
+                schemaRequestService: async (uri) => await context.env.fs?.readFile(vscode_uri_1.URI.parse(uri)) ?? '',
                 workspaceContext: getWorkspaceContextService(context),
                 clientCapabilities: context.env.clientCapabilities,
             });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-json",
-	"version": "0.0.47",
+	"version": "0.0.49",
 	"description": "Integrate vscode-json-languageservice into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/json",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -31,12 +31,12 @@
 		"vscode-languageserver-textdocument": "^1.0.11"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.2.3"
+		"@volar/language-service": "~2.3.0-alpha.1"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "d53f4dfa7007e77409af3ef28cc165e9940e7313"
+	"gitHead": "81275d75ab2adc03a643785a551ad31debd72866"
 }