Support schema relative imports. Fixes microsoft/monaco-editor#2097

pull/2748/head
Martin Aeschlimann 5 years ago
parent acb1bb306c
commit cbb9baab8c

@ -30,9 +30,10 @@
"prettier": "^2.1.2", "prettier": "^2.1.2",
"pretty-quick": "^3.0.2", "pretty-quick": "^3.0.2",
"requirejs": "^2.3.6", "requirejs": "^2.3.6",
"typescript": "4.0.3",
"terser": "^5.3.2", "terser": "^5.3.2",
"vscode-json-languageservice": "3.8.4" "typescript": "4.0.3",
"vscode-json-languageservice": "3.8.4",
"vscode-uri": "2.1.2"
}, },
"husky": { "husky": {
"hooks": { "hooks": {

@ -5,6 +5,7 @@
import * as jsonService from 'vscode-json-languageservice'; import * as jsonService from 'vscode-json-languageservice';
import type { worker } from './fillers/monaco-editor-core'; import type { worker } from './fillers/monaco-editor-core';
import { URI } from 'vscode-uri';
let defaultSchemaRequestService; let defaultSchemaRequestService;
if (typeof fetch !== 'undefined') { if (typeof fetch !== 'undefined') {
@ -24,6 +25,12 @@ export class JSONWorker {
this._languageSettings = createData.languageSettings; this._languageSettings = createData.languageSettings;
this._languageId = createData.languageId; this._languageId = createData.languageId;
this._languageService = jsonService.getLanguageService({ this._languageService = jsonService.getLanguageService({
workspaceContext: {
resolveRelativePath: (relativePath: string, resource: string) => {
const base = resource.substr(0, resource.lastIndexOf('/') + 1);
return resolvePath(base, relativePath);
}
},
schemaRequestService: createData.enableSchemaRequest && defaultSchemaRequestService schemaRequestService: createData.enableSchemaRequest && defaultSchemaRequestService
}); });
this._languageService.configure(this._languageSettings); this._languageService.configure(this._languageSettings);
@ -125,6 +132,54 @@ export class JSONWorker {
} }
} }
// URI path utilities, will (hopefully) move to vscode-uri
const Slash = '/'.charCodeAt(0);
const Dot = '.'.charCodeAt(0);
function isAbsolutePath(path: string) {
return path.charCodeAt(0) === Slash;
}
function resolvePath(uriString: string, path: string): string {
if (isAbsolutePath(path)) {
const uri = URI.parse(uriString);
const parts = path.split('/');
return uri.with({ path: normalizePath(parts) }).toString();
}
return joinPath(uriString, path);
}
function normalizePath(parts: string[]): string {
const newParts: string[] = [];
for (const part of parts) {
if (part.length === 0 || (part.length === 1 && part.charCodeAt(0) === Dot)) {
// ignore
} else if (part.length === 2 && part.charCodeAt(0) === Dot && part.charCodeAt(1) === Dot) {
newParts.pop();
} else {
newParts.push(part);
}
}
if (parts.length > 1 && parts[parts.length - 1].length === 0) {
newParts.push('');
}
let res = newParts.join('/');
if (parts[0].length === 0) {
res = '/' + res;
}
return res;
}
function joinPath(uriString: string, ...paths: string[]): string {
const uri = URI.parse(uriString);
const parts = uri.path.split('/');
for (let path of paths) {
parts.push(...path.split('/'));
}
return uri.with({ path: normalizePath(parts) }).toString();
}
export interface ICreateData { export interface ICreateData {
languageId: string; languageId: string;
languageSettings: jsonService.LanguageSettings; languageSettings: jsonService.LanguageSettings;

Loading…
Cancel
Save