michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ci] yarn format

Browse source
This commit is contained in:
matthewp 2021-08-10 13:31:09 +00:00 • committed by GitHub Actions
parent 2c5380a266
commit 16790aee7b
10 changed files with 280 additions and 340 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/language-server/astro.d.ts vendored
View file

@ -24,4 +24,4 @@ interface Astro {
declare const Astro: Astro;
export default function(): string;
export default function (): string;

4
tools/language-server/src/index.ts
View file

@ -67,8 +67,8 @@ export function startServer() {
hoverProvider: true,
signatureHelpProvider: {
triggerCharacters: ['(', ',', '<'],
retriggerCharacters: [')']
}
retriggerCharacters: [')'],
},
},
};
});

14
tools/language-server/src/plugins/PluginHost.ts
View file

@ -7,7 +7,7 @@ import type {
Position,
SignatureHelp,
SignatureHelpContext,
TextDocumentIdentifier
TextDocumentIdentifier,
} from 'vscode-languageserver';
import type { DocumentManager } from '../core/documents';
import type * as d from './interfaces';
@ -126,11 +126,7 @@ export class PluginHost {
throw new Error('Cannot call methods on an unopened document');
}
return await this.execute<any>(
'getSignatureHelp',
[document, position, context, cancellationToken],
ExecuteMode.FirstNonNull
);
return await this.execute<any>('getSignatureHelp', [document, position, context, cancellationToken], ExecuteMode.FirstNonNull);
}
onWatchFileChanges(onWatchFileChangesParams: any[]): void {
@ -159,10 +155,12 @@ export class PluginHost {
}
return null;
case ExecuteMode.Collect:
return Promise.all(plugins.map((plugin) => {
return Promise.all(
plugins.map((plugin) => {
let ret = this.tryExecutePlugin(plugin, name, args, []);
return ret;
}));
})
);
case ExecuteMode.None:
await Promise.all(plugins.map((plugin) => this.tryExecutePlugin(plugin, name, args, null)));
return;

12
tools/language-server/src/plugins/typescript/DocumentSnapshot.ts
View file

@ -75,9 +75,11 @@ class AstroDocumentSnapshot implements DocumentSnapshot {
/** @internal */
private transformContent(content: string) {
return content.replace(/---/g, '///') +
return (
content.replace(/---/g, '///') +
// Add TypeScript definitions
ASTRO_DEFINITION;
ASTRO_DEFINITION
);
}
get filePath() {
@ -139,9 +141,11 @@ export class DocumentFragmentSnapshot implements Omit<DocumentSnapshot, 'getFrag
/** @internal */
private transformContent(content: string) {
return content.replace(/---/g, '///') +
return (
content.replace(/---/g, '///') +
// Add TypeScript definitions
ASTRO_DEFINITION;
ASTRO_DEFINITION
);
}
getText(start: number, end: number) {

21
tools/language-server/src/plugins/typescript/TypeScriptPlugin.ts
View file

@ -1,11 +1,6 @@
import type { ConfigManager } from '../../core/config';
import type { CompletionsProvider, AppCompletionItem, AppCompletionList } from '../interfaces';
import type {
CancellationToken,
Hover,
SignatureHelp,
SignatureHelpContext
} from 'vscode-languageserver';
import type { CancellationToken, Hover, SignatureHelp, SignatureHelpContext } from 'vscode-languageserver';
import { join as pathJoin, dirname as pathDirname } from 'path';
import { Document, DocumentManager, isInsideFrontmatter } from '../../core/documents';
import { SourceFile, ImportDeclaration, Node, SyntaxKind } from 'typescript';
@ -134,18 +129,8 @@ export class TypeScriptPlugin implements CompletionsProvider {
}
}
async getSignatureHelp(
document: Document,
position: Position,
context: SignatureHelpContext | undefined,
cancellationToken?: CancellationToken
): Promise<SignatureHelp | null> {
return this.signatureHelpProvider.getSignatureHelp(
document,
position,
context,
cancellationToken
);
async getSignatureHelp(document: Document, position: Position, context: SignatureHelpContext | undefined, cancellationToken?: CancellationToken): Promise<SignatureHelp | null> {
return this.signatureHelpProvider.getSignatureHelp(document, position, context, cancellationToken);
}
/**

3
tools/language-server/src/plugins/typescript/features/CompletionsProvider.ts
View file

@ -34,8 +34,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
const offset = document.offsetAt(position);
const entries =
lang.getCompletionsAtPosition(fragment.filePath, offset, completionOptions)?.entries || [];
const entries = lang.getCompletionsAtPosition(fragment.filePath, offset, completionOptions)?.entries || [];
const completionItems = entries
.map((entry: ts.CompletionEntry) => this.toCompletionItem(fragment, entry, document.uri, position, new Set()))

6
tools/language-server/src/plugins/typescript/features/HoverProvider.ts
View file

@ -26,13 +26,11 @@ export class HoverProviderImpl implements HoverProvider {
const documentation = getMarkdownDocumentation(info.documentation, info.tags);
// https://microsoft.github.io/language-server-protocol/specification#textDocument_hover
const contents = ['```typescript', declaration, '```']
.concat(documentation ? ['---', documentation] : [])
.join('\n');
const contents = ['```typescript', declaration, '```'].concat(documentation ? ['---', documentation] : []).join('\n');
return mapObjWithRangeToOriginal(fragment, {
range: convertRange(fragment, textSpan),
contents
contents,
});
}

57
tools/language-server/src/plugins/typescript/features/SignatureHelpProvider.ts
View file

@ -9,7 +9,7 @@ import {
SignatureInformation,
ParameterInformation,
MarkupKind,
CancellationToken
CancellationToken,
} from 'vscode-languageserver';
import { Document } from '../../../core/documents';
import { getMarkdownDocumentation } from '../previewer';
@ -21,12 +21,7 @@ export class SignatureHelpProviderImpl implements SignatureHelpProvider {
private static readonly triggerCharacters = ['(', ',', '<'];
private static readonly retriggerCharacters = [')'];
async getSignatureHelp(
document: Document,
position: Position,
context: SignatureHelpContext | undefined,
cancellationToken?: CancellationToken
): Promise<SignatureHelp | null> {
async getSignatureHelp(document: Document, position: Position, context: SignatureHelpContext | undefined, cancellationToken?: CancellationToken): Promise<SignatureHelp | null> {
const { lang, tsDoc } = await this.lang.getTypeScriptDoc(document);
const fragment = await tsDoc.getFragment();
@ -36,15 +31,8 @@ export class SignatureHelpProviderImpl implements SignatureHelpProvider {
const offset = fragment.offsetAt(fragment.getGeneratedPosition(position));
const triggerReason = this.toTsTriggerReason(context);
const info = lang.getSignatureHelpItems(
toVirtualAstroFilePath(tsDoc.filePath),
offset,
triggerReason ? { triggerReason } : undefined
);
if (
!info ||
info.items.some((signature) => this.isInSvelte2tsxGeneratedFunction(signature))
) {
const info = lang.getSignatureHelpItems(toVirtualAstroFilePath(tsDoc.filePath), offset, triggerReason ? { triggerReason } : undefined);
if (!info || info.items.some((signature) => this.isInSvelte2tsxGeneratedFunction(signature))) {
return null;
}
@ -53,33 +41,22 @@ export class SignatureHelpProviderImpl implements SignatureHelpProvider {
return {
signatures,
activeSignature: info.selectedItemIndex,
activeParameter: info.argumentIndex
activeParameter: info.argumentIndex,
};
}
private isReTrigger(
isRetrigger: boolean,
triggerCharacter: string
): triggerCharacter is ts.SignatureHelpRetriggerCharacter {
return (
isRetrigger &&
(this.isTriggerCharacter(triggerCharacter) ||
SignatureHelpProviderImpl.retriggerCharacters.includes(triggerCharacter))
);
private isReTrigger(isRetrigger: boolean, triggerCharacter: string): triggerCharacter is ts.SignatureHelpRetriggerCharacter {
return isRetrigger && (this.isTriggerCharacter(triggerCharacter) || SignatureHelpProviderImpl.retriggerCharacters.includes(triggerCharacter));
}
private isTriggerCharacter(
triggerCharacter: string
): triggerCharacter is ts.SignatureHelpTriggerCharacter {
private isTriggerCharacter(triggerCharacter: string): triggerCharacter is ts.SignatureHelpTriggerCharacter {
return SignatureHelpProviderImpl.triggerCharacters.includes(triggerCharacter);
}
/**
* adopted from https://github.com/microsoft/vscode/blob/265a2f6424dfbd3a9788652c7d376a7991d049a3/extensions/typescript-language-features/src/languageFeatures/signatureHelp.ts#L103
*/
private toTsTriggerReason(
context: SignatureHelpContext | undefined
): ts.SignatureHelpTriggerReason {
private toTsTriggerReason(context: SignatureHelpContext | undefined): ts.SignatureHelpTriggerReason {
switch (context?.triggerKind) {
case SignatureHelpTriggerKind.TriggerCharacter:
if (context.triggerCharacter) {
@ -89,7 +66,7 @@ export class SignatureHelpProviderImpl implements SignatureHelpProvider {
if (this.isTriggerCharacter(context.triggerCharacter)) {
return {
kind: 'characterTyped',
triggerCharacter: context.triggerCharacter
triggerCharacter: context.triggerCharacter,
};
}
}
@ -107,11 +84,7 @@ export class SignatureHelpProviderImpl implements SignatureHelpProvider {
* adopted from https://github.com/microsoft/vscode/blob/265a2f6424dfbd3a9788652c7d376a7991d049a3/extensions/typescript-language-features/src/languageFeatures/signatureHelp.ts#L73
*/
private toSignatureHelpInformation(item: ts.SignatureHelpItem): SignatureInformation {
const [prefixLabel, separatorLabel, suffixLabel] = [
item.prefixDisplayParts,
item.separatorDisplayParts,
item.suffixDisplayParts
].map(ts.displayPartsToString);
const [prefixLabel, separatorLabel, suffixLabel] = [item.prefixDisplayParts, item.separatorDisplayParts, item.suffixDisplayParts].map(ts.displayPartsToString);
let textIndex = prefixLabel.length;
let signatureLabel = '';
@ -143,16 +116,14 @@ export class SignatureHelpProviderImpl implements SignatureHelpProvider {
documentation: signatureDocumentation
? {
value: signatureDocumentation,
kind: MarkupKind.Markdown
kind: MarkupKind.Markdown,
}
: undefined,
parameters
parameters,
};
}
private isInSvelte2tsxGeneratedFunction(signatureHelpItem: ts.SignatureHelpItem) {
return signatureHelpItem.prefixDisplayParts.some((part) =>
part.text.includes('__sveltets')
);
return signatureHelpItem.prefixDisplayParts.some((part) => part.text.includes('__sveltets'));
}
}

51
tools/language-server/src/plugins/typescript/previewer.ts
View file

@ -7,16 +7,14 @@
* adopted from https://github.com/microsoft/vscode/blob/10722887b8629f90cc38ee7d90d54e8246dc895f/extensions/typescript-language-features/src/utils/previewer.ts
*/
import ts from 'typescript';
import { isNotNullOrUndefined } from '../../utils';
import ts from 'typescript';
import { isNotNullOrUndefined } from '../../utils';
function replaceLinks(text: string): string {
function replaceLinks(text: string): string {
return (
text
// Http(s) links
.replace(
/\{@(link|linkplain|linkcode) (https?:\/\/[^ |}]+?)(?:[| ]([^{}\n]+?))?\}/gi,
(_, tag: string, link: string, text?: string) => {
.replace(/\{@(link|linkplain|linkcode) (https?:\/\/[^ |}]+?)(?:[| ]([^{}\n]+?))?\}/gi, (_, tag: string, link: string, text?: string) => {
switch (tag) {
case 'linkcode':
return `[\`${text ? text.trim() : link}\`](${link})`;
@ -24,16 +22,15 @@
default:
return `[${text ? text.trim() : link}](${link})`;
}
}
)
})
);
}
}
function processInlineTags(text: string): string {
function processInlineTags(text: string): string {
return replaceLinks(text);
}
}
function getTagBodyText(tag: ts.JSDocTagInfo): string | undefined {
function getTagBodyText(tag: ts.JSDocTagInfo): string | undefined {
if (!tag.text) {
return undefined;
}
@ -50,11 +47,7 @@
// check for caption tags, fix for https://github.com/microsoft/vscode/issues/79704
const captionTagMatches = text.match(/<caption>(.*?)<\/caption>\s*(\r\n|\n)/);
if (captionTagMatches && captionTagMatches.index === 0) {
return (
captionTagMatches[1] +
'\n\n' +
makeCodeblock(text.substr(captionTagMatches[0].length))
);
return captionTagMatches[1] + '\n\n' + makeCodeblock(text.substr(captionTagMatches[0].length));
} else {
return makeCodeblock(text);
}
@ -81,9 +74,9 @@
}
return processInlineTags(ts.displayPartsToString(tag.text));
}
}
export function getTagDocumentation(tag: ts.JSDocTagInfo): string | undefined {
export function getTagDocumentation(tag: ts.JSDocTagInfo): string | undefined {
function getWithType() {
const body = (ts.displayPartsToString(tag.text) || '').split(/^(\S+)\s*-?\s*/);
if (body?.length === 3) {
@ -93,12 +86,7 @@
if (!doc) {
return label;
}
return (
label +
(doc.match(/\r\n|\n/g)
? ' \n' + processInlineTags(doc)
: ` — ${processInlineTags(doc)}`)
);
return label + (doc.match(/\r\n|\n/g) ? ' \n' + processInlineTags(doc) : ` — ${processInlineTags(doc)}`);
}
}
@ -117,16 +105,13 @@
return label;
}
return label + (text.match(/\r\n|\n/g) ? ' \n' + text : ` — ${text}`);
}
}
export function plain(parts: ts.SymbolDisplayPart[] | string): string {
export function plain(parts: ts.SymbolDisplayPart[] | string): string {
return processInlineTags(typeof parts === 'string' ? parts : ts.displayPartsToString(parts));
}
}
export function getMarkdownDocumentation(
documentation: ts.SymbolDisplayPart[] | undefined,
tags: ts.JSDocTagInfo[] | undefined
) {
export function getMarkdownDocumentation(documentation: ts.SymbolDisplayPart[] | undefined, tags: ts.JSDocTagInfo[] | undefined) {
let result: Array<string | undefined> = [];
if (documentation) {
result.push(plain(documentation));
@ -137,4 +122,4 @@
}
return result.filter(isNotNullOrUndefined).join('\n\n');
}
}

2
tools/language-server/src/plugins/typescript/utils.ts
View file

@ -178,7 +178,7 @@ export function isVirtualFilePath(filePath: string) {
}
export function toVirtualAstroFilePath(filePath: string) {
if(isVirtualFrameworkFilePath('astro', filePath)) {
if (isVirtualFrameworkFilePath('astro', filePath)) {
return filePath;
}
return `${filePath}.ts`;