From 513624952dd133624e3d9bbc5f21f16305856da2 Mon Sep 17 00:00:00 2001 From: Quramy Date: Fri, 15 Mar 2024 12:26:17 +0900 Subject: [PATCH] chore: Remove commented out lines --- src/analyzer/analyzer.ts | 11 ++--- src/analyzer/extractor.ts | 6 --- .../get-completion-at-position.ts | 2 +- .../get-quick-info-at-position.ts | 2 +- .../graphql-language-service-adapter.ts | 42 +++++++------------ src/graphql-language-service-adapter/types.ts | 2 +- .../plugin-module-factory.ts | 11 ++--- 7 files changed, 25 insertions(+), 51 deletions(-) diff --git a/src/analyzer/analyzer.ts b/src/analyzer/analyzer.ts index 1206ced3..e3c811b8 100644 --- a/src/analyzer/analyzer.ts +++ b/src/analyzer/analyzer.ts @@ -92,14 +92,9 @@ export class Analyzer { fragmentRegistry.registerDocuments( fileName, version, - findAllNodes(sourceFile, node => { - // if (tag && ts.isTaggedTemplateExpression(node) && hasTagged(node, tag, sourceFile)) { - // return node.template; - // } else if (ts.isNoSubstitutionTemplateLiteral(node) || ts.isTemplateExpression(node)) { - // return node; - // } - return getTemplateNodeUnder(node, tag); - }).map(node => getSanitizedTemplateText(node, sourceFile)), + findAllNodes(sourceFile, node => getTemplateNodeUnder(node, tag)).map(node => + getSanitizedTemplateText(node, sourceFile), + ), ); } }, diff --git a/src/analyzer/extractor.ts b/src/analyzer/extractor.ts index 963412b7..fa328882 100644 --- a/src/analyzer/extractor.ts +++ b/src/analyzer/extractor.ts @@ -97,12 +97,6 @@ export class Extractor { this._debug(targetFiles.map(f => ' ' + f).join(',\n')); targetFiles.forEach(fileName => { if (this._helper.isExcluded(fileName)) return; - // const nodes = this._helper - // .getAllNodes(fileName, node => ts.isTemplateExpression(node) || ts.isNoSubstitutionTemplateLiteral(node)) - // .filter(node => (tag ? isTagged(node, tag) : true)) as ( - // | ts.TemplateExpression - // | ts.NoSubstitutionTemplateLiteral - // )[]; const nodes = this._helper.getAllNodes(fileName, node => getTemplateNodeUnder(node, tag)); nodes.forEach(node => { const { resolvedInfo, resolveErrors } = this._helper.resolveTemplateLiteral(fileName, node); diff --git a/src/graphql-language-service-adapter/get-completion-at-position.ts b/src/graphql-language-service-adapter/get-completion-at-position.ts index 543f3a4a..2c8aef52 100644 --- a/src/graphql-language-service-adapter/get-completion-at-position.ts +++ b/src/graphql-language-service-adapter/get-completion-at-position.ts @@ -33,7 +33,7 @@ export function getCompletionAtPosition( if (ctx.getScriptSourceHelper().isExcluded(fileName)) return delegate(fileName, position, options); const schema = ctx.getSchema(); if (!schema) return delegate(fileName, position, options); - const node = ctx.findTemplateNode(fileName, position); + const node = ctx.findAscendantTemplateNode(fileName, position); if (!node) return delegate(fileName, position, options); const { resolvedInfo } = ctx.resolveTemplateInfo(fileName, node); if (!resolvedInfo) { diff --git a/src/graphql-language-service-adapter/get-quick-info-at-position.ts b/src/graphql-language-service-adapter/get-quick-info-at-position.ts index 1aec9f3f..7fb0bc29 100644 --- a/src/graphql-language-service-adapter/get-quick-info-at-position.ts +++ b/src/graphql-language-service-adapter/get-quick-info-at-position.ts @@ -12,7 +12,7 @@ export function getQuickInfoAtPosition( if (ctx.getScriptSourceHelper().isExcluded(fileName)) return delegate(fileName, position); const schema = ctx.getSchema(); if (!schema) return delegate(fileName, position); - const node = ctx.findTemplateNode(fileName, position); + const node = ctx.findAscendantTemplateNode(fileName, position); if (!node) return delegate(fileName, position); const { resolvedInfo } = ctx.resolveTemplateInfo(fileName, node); if (!resolvedInfo) return delegate(fileName, position); diff --git a/src/graphql-language-service-adapter/graphql-language-service-adapter.ts b/src/graphql-language-service-adapter/graphql-language-service-adapter.ts index 2e97c1a4..28c623bb 100644 --- a/src/graphql-language-service-adapter/graphql-language-service-adapter.ts +++ b/src/graphql-language-service-adapter/graphql-language-service-adapter.ts @@ -87,49 +87,39 @@ export class GraphQLLanguageServiceAdapter { getExternalFragmentDefinitions: (documentStr, fileName, sourcePosition) => this._fragmentRegisry.getExternalFragments(documentStr, fileName, sourcePosition), getDuplicaterdFragmentDefinitions: () => this._fragmentRegisry.getDuplicaterdFragmentDefinitions(), - findTemplateNode: (fileName, position) => this._findTemplateNode(fileName, position), + findAscendantTemplateNode: (fileName, position) => this._findAscendantTemplateNode(fileName, position), findTemplateNodes: fileName => this._findTemplateNodes(fileName), resolveTemplateInfo: (fileName, node) => this._resolveTemplateInfo(fileName, node), }; return ctx; } - private _findTemplateNode(fileName: string, position: number) { - const foundNode = this._helper.getNode(fileName, position); - if (!foundNode) return; - let node: ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression; - if (ts.isNoSubstitutionTemplateLiteral(foundNode)) { - node = foundNode; - } else if (ts.isTemplateHead(foundNode) && !isTemplateLiteralTypeNode(foundNode.parent)) { - node = foundNode.parent; + private _findAscendantTemplateNode(fileName: string, position: number) { + const nodeUnderCursor = this._helper.getNode(fileName, position); + if (!nodeUnderCursor) return; + + let templateNode: ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression; + + if (ts.isNoSubstitutionTemplateLiteral(nodeUnderCursor)) { + templateNode = nodeUnderCursor; + } else if (ts.isTemplateHead(nodeUnderCursor) && !isTemplateLiteralTypeNode(nodeUnderCursor.parent)) { + templateNode = nodeUnderCursor.parent; } else if ( - (ts.isTemplateMiddle(foundNode) || ts.isTemplateTail(foundNode)) && - !isTemplateLiteralTypeNode(foundNode.parent.parent) + (ts.isTemplateMiddle(nodeUnderCursor) || ts.isTemplateTail(nodeUnderCursor)) && + !isTemplateLiteralTypeNode(nodeUnderCursor.parent.parent) ) { - node = foundNode.parent.parent; + templateNode = nodeUnderCursor.parent.parent; } else { return; } - // if (this._tagCondition && !isTagged(node, this._tagCondition)) { - // return; - // } - if (!isTaggedTemplateNode(node, this._tagCondition)) { + if (!isTaggedTemplateNode(templateNode, this._tagCondition)) { return; } - return node; + return templateNode; } private _findTemplateNodes(fileName: string) { return this._helper.getAllNodes(fileName, node => getTemplateNodeUnder(node, this._tagCondition)); - // const allTemplateStringNodes = this._helper.getAllNodes( - // fileName, - // (n: ts.Node) => ts.isNoSubstitutionTemplateLiteral(n) || ts.isTemplateExpression(n), - // ); - // const nodes = allTemplateStringNodes.filter(n => { - // if (!this._tagCondition) return true; - // return isTagged(n, this._tagCondition); - // }) as (ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression)[]; - // return nodes; } private _parse(text: string) { diff --git a/src/graphql-language-service-adapter/types.ts b/src/graphql-language-service-adapter/types.ts index 7c1e5496..0586340f 100644 --- a/src/graphql-language-service-adapter/types.ts +++ b/src/graphql-language-service-adapter/types.ts @@ -20,7 +20,7 @@ export interface AnalysisContext { ): FragmentDefinitionNode[]; getDuplicaterdFragmentDefinitions(): Set; getGraphQLDocumentNode(text: string): DocumentNode | undefined; - findTemplateNode( + findAscendantTemplateNode( fileName: string, position: number, ): ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression | undefined; diff --git a/src/language-service-plugin/plugin-module-factory.ts b/src/language-service-plugin/plugin-module-factory.ts index ec6ddbf3..f845b6b6 100644 --- a/src/language-service-plugin/plugin-module-factory.ts +++ b/src/language-service-plugin/plugin-module-factory.ts @@ -31,14 +31,9 @@ function create(info: ts.server.PluginCreateInfo): ts.LanguageService { fragmentRegistry.registerDocuments( fileName, version, - findAllNodes(sourceFile, node => { - // if (tag && ts.isTaggedTemplateExpression(node) && hasTagged(node, tag, sourceFile)) { - // return node.template; - // } else if (ts.isNoSubstitutionTemplateLiteral(node) || ts.isTemplateExpression(node)) { - // return node; - // } - return getTemplateNodeUnder(node, tag); - }).map(node => getSanitizedTemplateText(node, sourceFile)), + findAllNodes(sourceFile, node => getTemplateNodeUnder(node, tag)).map(node => + getSanitizedTemplateText(node, sourceFile), + ), ); };