Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use fs provider for loading schemas (#221136)

Browse Source 
* use file system provider for schemas

* fix getSchemaContent

* update

* update

* polish

* feedback

---------

Co-authored-by: Sandeep Somavarapu <sasomava@microsoft.com>
This commit is contained in:
Martin Aeschlimann
2024-07-09 14:56:04 +02:00
committed by GitHub
parent bfdfd71568
commit 3be49eccc5
7 changed files with 245 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
extensions/json-language-features/client/src/jsonClient.ts
View File

@@ -8,7 +8,8 @@ export type JSONLanguageStatus = { schemas: string[] };
import {
workspace, window, languages, commands, LogOutputChannel, ExtensionContext, extensions, Uri, ColorInformation,
Diagnostic, StatusBarAlignment, TextEditor, TextDocument, FormattingOptions, CancellationToken, FoldingRange,
ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n
ProviderResult, TextEdit, Range, Position, Disposable, CompletionItem, CompletionList, CompletionContext, Hover, MarkdownString, FoldingContext, DocumentSymbol, SymbolInformation, l10n,
RelativePattern
} from 'vscode';
import {
LanguageClientOptions, RequestType, NotificationType, FormattingOptions as LSPFormattingOptions, DocumentDiagnosticReportKind,
@@ -360,18 +361,29 @@ async function startClientWithParticipants(context: ExtensionContext, languagePa
const schemaDocuments: { [uri: string]: boolean } = {};
// handle content request
client.onRequest(VSCodeContentRequest.type, (uriPath: string) => {
client.onRequest(VSCodeContentRequest.type, async (uriPath: string) => {
const uri = Uri.parse(uriPath);
const uriString = uri.toString();
if (uri.scheme === 'untitled') {
return Promise.reject(new ResponseError(3, l10n.t('Unable to load {0}', uri.toString())));
throw new ResponseError(3, l10n.t('Unable to load {0}', uriString));
}
if (uri.scheme !== 'http' && uri.scheme !== 'https') {
return workspace.openTextDocument(uri).then(doc => {
schemaDocuments[uri.toString()] = true;
return doc.getText();
}, error => {
return Promise.reject(new ResponseError(2, error.toString()));
});
if (uri.scheme === 'vscode') {
try {
runtime.logOutputChannel.info('read schema from vscode: ' + uriString);
ensureFilesystemWatcherInstalled(uri);
const content = await workspace.fs.readFile(uri);
return new TextDecoder().decode(content);
} catch (e) {
throw new ResponseError(5, e.toString(), e);
}
} else if (uri.scheme !== 'http' && uri.scheme !== 'https') {
try {
const document = await workspace.openTextDocument(uri);
schemaDocuments[uriString] = true;
return document.getText();
} catch (e) {
throw new ResponseError(2, e.toString(), e);
}
} else if (schemaDownloadEnabled) {
if (runtime.telemetry && uri.authority === 'schema.management.azure.com') {
/* __GDPR__
@@ -381,13 +393,15 @@ async function startClientWithParticipants(context: ExtensionContext, languagePa
"schemaURL" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The azure schema URL that was requested." }
}
*/
runtime.telemetry.sendTelemetryEvent('json.schema', { schemaURL: uriPath });
runtime.telemetry.sendTelemetryEvent('json.schema', { schemaURL: uriString });
}
try {
return await runtime.schemaRequests.getContent(uriString);
} catch (e) {
throw new ResponseError(4, e.toString());
}
return runtime.schemaRequests.getContent(uriPath).catch(e => {
return Promise.reject(new ResponseError(4, e.toString()));
});
} else {
return Promise.reject(new ResponseError(1, l10n.t('Downloading schemas is disabled through setting \'{0}\'', SettingIds.enableSchemaDownload)));
throw new ResponseError(1, l10n.t('Downloading schemas is disabled through setting \'{0}\'', SettingIds.enableSchemaDownload));
}
});
@@ -415,15 +429,50 @@ async function startClientWithParticipants(context: ExtensionContext, languagePa
schemaResolutionErrorStatusBarItem.hide();
}
};
toDispose.push(workspace.onDidChangeTextDocument(e => handleContentChange(e.document.uri.toString())));
toDispose.push(workspace.onDidCloseTextDocument(d => {
const uriString = d.uri.toString();
const handleContentClosed = (uriString: string) => {
if (handleContentChange(uriString)) {
delete schemaDocuments[uriString];
}
fileSchemaErrors.delete(uriString);
};
const watchers: Map<string, Disposable> = new Map();
toDispose.push(new Disposable(() => {
for (const d of watchers.values()) {
d.dispose();
}
}));
const ensureFilesystemWatcherInstalled = (uri: Uri) => {
const uriString = uri.toString();
if (!watchers.has(uriString)) {
try {
const watcher = workspace.createFileSystemWatcher(new RelativePattern(uri, '*'));
const handleChange = (uri: Uri) => {
runtime.logOutputChannel.info('schema change detected ' + uri.toString());
client.sendNotification(SchemaContentChangeNotification.type, uriString);
};
const createListener = watcher.onDidCreate(handleChange);
const changeListener = watcher.onDidChange(handleChange);
const deleteListener = watcher.onDidDelete(() => {
const watcher = watchers.get(uriString);
if (watcher) {
watcher.dispose();
watchers.delete(uriString);
}
});
watchers.set(uriString, Disposable.from(watcher, createListener, changeListener, deleteListener));
} catch {
runtime.logOutputChannel.info('Problem installing a file system watcher for ' + uriString);
}
}
};
toDispose.push(workspace.onDidChangeTextDocument(e => handleContentChange(e.document.uri.toString())));
toDispose.push(workspace.onDidCloseTextDocument(d => handleContentClosed(d.uri.toString())));
toDispose.push(window.onDidChangeActiveTextEditor(handleActiveEditorChange));
const handleRetryResolveSchemaCommand = () => {