Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-25 04:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #64022

Browse Source
This commit is contained in:
Pine Wu
2019-01-27 23:16:41 -08:00
parent b1bf8102a5
commit 33783baaa1
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
extensions/html-language-features/client/src/customData.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as path from 'path';
import { workspace, WorkspaceFolder } from 'vscode';
import { workspace, WorkspaceFolder, extensions } from 'vscode';
interface ExperimentalConfig {
experimental?: {
@@ -12,14 +12,11 @@ interface ExperimentalConfig {
};
}
export function getCustomDataPathsInAllWorkspaces(workspaceFolders: WorkspaceFolder[] | undefined) {
export function getCustomDataPathsInAllWorkspaces(workspaceFolders: WorkspaceFolder[] | undefined): string[] {
const dataPaths: string[] = [];
if (!workspaceFolders) {
return {
dataPaths
};
return dataPaths;
}
workspaceFolders.forEach(wf => {
@@ -39,7 +36,22 @@ export function getCustomDataPathsInAllWorkspaces(workspaceFolders: WorkspaceFol
}
});
return {
dataPaths
};
return dataPaths;
}
export function getCustomDataPathsFromAllExtensions(): string[] {
const dataPaths: string[] = [];
for (const extension of extensions.all) {
const contributes = extension.packageJSON && extension.packageJSON.contributes;
if (contributes && contributes.html && contributes.html.customData && Array.isArray(contributes.html.customData)) {
const relativePaths: string[] = contributes.html.customData;
relativePaths.forEach(rp => {
dataPaths.push(path.resolve(extension.extensionPath, rp));
});
}
}
return dataPaths;
}

7
extensions/html-language-features/client/src/htmlMain.ts
View File

@@ -13,7 +13,7 @@ import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, Re
import { EMPTY_ELEMENTS } from './htmlEmptyTagsShared';
import { activateTagClosing } from './tagClosing';
import TelemetryReporter from 'vscode-extension-telemetry';
import { getCustomDataPathsInAllWorkspaces } from './customData';
import { getCustomDataPathsInAllWorkspaces, getCustomDataPathsFromAllExtensions } from './customData';
namespace TagCloseRequest {
export const type: RequestType<TextDocumentPositionParams, string, any, any> = new RequestType('html/tag');
@@ -50,7 +50,10 @@ export function activate(context: ExtensionContext) {
let documentSelector = ['html', 'handlebars', 'razor'];
let embeddedLanguages = { css: true, javascript: true };
let { dataPaths } = getCustomDataPathsInAllWorkspaces(workspace.workspaceFolders);
let dataPaths = [
...getCustomDataPathsInAllWorkspaces(workspace.workspaceFolders),
...getCustomDataPathsFromAllExtensions()
];
// Options to control the language client
let clientOptions: LanguageClientOptions = {