Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use shared config for html server

Browse Source
This commit is contained in:
Matt Bierner
2018-10-02 00:15:42 -07:00
parent ef5bd4810a
commit 9116ec29ab
10 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/html-language-features/server/src/htmlServerMain.ts
View File

@@ -136,7 +136,7 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
return { capabilities };
});
connection.onInitialized((p) => {
connection.onInitialized(() => {
if (workspaceFoldersSupport) {
connection.client.register(DidChangeWorkspaceFoldersNotification.type);

2
extensions/html-language-features/server/src/modes/cssMode.ts
View File

@@ -24,7 +24,7 @@ export function getCSSMode(documentRegions: LanguageModelCache<HTMLDocumentRegio
let embedded = embeddedCSSDocuments.get(document);
return cssLanguageService.doValidation(embedded, cssStylesheets.get(embedded), settings && settings.css);
},
doComplete(document: TextDocument, position: Position, settings = workspace.settings) {
doComplete(document: TextDocument, position: Position, _settings = workspace.settings) {
let embedded = embeddedCSSDocuments.get(document);
const stylesheet = cssStylesheets.get(embedded);
return cssLanguageService.doComplete(embedded, position, stylesheet) || CompletionList.create();

2
extensions/html-language-features/server/src/modes/embeddedSupport.ts
View File

@@ -132,7 +132,7 @@ function getLanguageRanges(document: TextDocument, regions: EmbeddedRegion[], ra
return result;
}
function getLanguagesInDocument(document: TextDocument, regions: EmbeddedRegion[]): string[] {
function getLanguagesInDocument(_document: TextDocument, regions: EmbeddedRegion[]): string[] {
let result = [];
for (let region of regions) {
if (region.languageId && result.indexOf(region.languageId) === -1) {

2
extensions/html-language-features/server/src/modes/htmlFolding.ts
View File

@@ -7,7 +7,7 @@ import { TextDocument, CancellationToken, Position, Range } from 'vscode-languag
import { FoldingRange } from 'vscode-languageserver-types';
import { LanguageModes, LanguageMode } from './languageModes';
export function getFoldingRanges(languageModes: LanguageModes, document: TextDocument, maxRanges: number | undefined, cancellationToken: CancellationToken | null): FoldingRange[] {
export function getFoldingRanges(languageModes: LanguageModes, document: TextDocument, maxRanges: number | undefined, _cancellationToken: CancellationToken | null): FoldingRange[] {
let htmlMode = languageModes.getMode('html');
let range = Range.create(Position.create(0, 0), Position.create(document.lineCount, 0));
let result: FoldingRange[] = [];

4
extensions/html-language-features/server/src/modes/javascriptMode.ts
View File

@@ -10,7 +10,7 @@ import {
Definition, TextEdit, TextDocument, Diagnostic, DiagnosticSeverity, Range, CompletionItemKind, Hover, MarkedString,
DocumentHighlight, DocumentHighlightKind, CompletionList, Position, FormattingOptions, FoldingRange, FoldingRangeKind
} from 'vscode-languageserver-types';
import { LanguageMode, Settings, Workspace } from './languageModes';
import { LanguageMode, Settings } from './languageModes';
import { getWordAtText, startsWith, isWhitespaceOnly, repeat } from '../utils/strings';
import { HTMLDocumentRegions } from './embeddedSupport';
@@ -25,7 +25,7 @@ if (!ts.sys.fileExists(jquery_d_ts)) {
jquery_d_ts = join(__dirname, '../../lib/jquery.d.ts'); // from source
}
export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>, workspace: Workspace): LanguageMode {
export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>): LanguageMode {
let jsDocuments = getLanguageModelCache<TextDocument>(10, 60, document => documentRegions.get(document).getEmbeddedDocument('javascript'));
let compilerOptions: ts.CompilerOptions = { allowNonTsExtensions: true, allowJs: true, lib: ['lib.es6.d.ts'], target: ts.ScriptTarget.Latest, moduleResolution: ts.ModuleResolutionKind.Classic };

2
extensions/html-language-features/server/src/modes/languageModes.ts
View File

@@ -80,7 +80,7 @@ export function getLanguageModes(supportedLanguages: { [languageId: string]: boo
modes['css'] = getCSSMode(documentRegions, workspace);
}
if (supportedLanguages['javascript']) {
modes['javascript'] = getJavaScriptMode(documentRegions, workspace);
modes['javascript'] = getJavaScriptMode(documentRegions);
}
return {
getModeAtPosition(document: TextDocument, position: Position): LanguageMode | undefined {

3
extensions/html-language-features/server/src/modes/pathCompletion.ts
View File

@@ -19,7 +19,7 @@ export function getPathCompletionParticipant(
result: CompletionItem[]
): ICompletionParticipant {
return {
onHtmlAttributeValue: ({ tag, position, attribute, value: valueBeforeCursor, range }) => {
onHtmlAttributeValue: ({ tag, attribute, value: valueBeforeCursor, range }) => {
const fullValue = stripQuotes(document.getText(range));
if (shouldDoPathCompletion(tag, attribute, fullValue)) {
@@ -145,6 +145,7 @@ function resolveWorkspaceRoot(activeDoc: TextDocument, workspaceFolders: Workspa
return path.resolve(URI.parse(workspaceFolders[i].uri).fsPath);
}
}
return undefined;
}
function shiftPosition(pos: Position, offset: number): Position {

6
extensions/html-language-features/server/src/test/completions.test.ts
View File

@@ -21,7 +21,7 @@ export interface ItemDescription {
notAvailable?: boolean;
}
export function assertCompletion(completions: CompletionList, expected: ItemDescription, document: TextDocument, offset: number) {
export function assertCompletion(completions: CompletionList, expected: ItemDescription, document: TextDocument) {
let matches = completions.items.filter(completion => {
return completion.label === expected.label;
});
@@ -70,7 +70,7 @@ export function testCompletionFor(value: string, expected: { count?: number, ite
}
if (expected.items) {
for (let item of expected.items) {
assertCompletion(list, item, document, offset);
assertCompletion(list, item, document);
}
}
}
@@ -296,7 +296,7 @@ suite('HTML Path Completion', () => {
]
}, indexHtmlUri, [fixtureWorkspace]);
});
test('Completion should ignore files/folders starting with dot', () => {
testCompletionFor('<script src="./|"', {
count: 3

4
extensions/html-language-features/server/src/utils/runner.ts
View File

@@ -19,7 +19,7 @@ export function formatError(message: string, err: any): string {
}
export function runSafeAsync<T>(func: () => Thenable<T>, errorVal: T, errorMessage: string, token: CancellationToken): Thenable<T | ResponseError<any>> {
return new Promise<T | ResponseError<any>>((resolve, reject) => {
return new Promise<T | ResponseError<any>>((resolve) => {
setImmediate(() => {
if (token.isCancellationRequested) {
resolve(cancelValue());
@@ -40,7 +40,7 @@ export function runSafeAsync<T>(func: () => Thenable<T>, errorVal: T, errorMessa
}
export function runSafe<T, E>(func: () => T, errorVal: T, errorMessage: string, token: CancellationToken): Thenable<T | ResponseError<E>> {
return new Promise<T | ResponseError<E>>((resolve, reject) => {
return new Promise<T | ResponseError<E>>((resolve) => {
setImmediate(() => {
if (token.isCancellationRequested) {
resolve(cancelValue());