Skip to content

Commit 5136249

Browse files
committed
chore: Remove commented out lines
1 parent 37219ef commit 5136249

File tree

7 files changed

+25
-51
lines changed

7 files changed

+25
-51
lines changed

src/analyzer/analyzer.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,9 @@ export class Analyzer {
9292
fragmentRegistry.registerDocuments(
9393
fileName,
9494
version,
95-
findAllNodes(sourceFile, node => {
96-
// if (tag && ts.isTaggedTemplateExpression(node) && hasTagged(node, tag, sourceFile)) {
97-
// return node.template;
98-
// } else if (ts.isNoSubstitutionTemplateLiteral(node) || ts.isTemplateExpression(node)) {
99-
// return node;
100-
// }
101-
return getTemplateNodeUnder(node, tag);
102-
}).map(node => getSanitizedTemplateText(node, sourceFile)),
95+
findAllNodes(sourceFile, node => getTemplateNodeUnder(node, tag)).map(node =>
96+
getSanitizedTemplateText(node, sourceFile),
97+
),
10398
);
10499
}
105100
},

src/analyzer/extractor.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@ export class Extractor {
9797
this._debug(targetFiles.map(f => ' ' + f).join(',\n'));
9898
targetFiles.forEach(fileName => {
9999
if (this._helper.isExcluded(fileName)) return;
100-
// const nodes = this._helper
101-
// .getAllNodes(fileName, node => ts.isTemplateExpression(node) || ts.isNoSubstitutionTemplateLiteral(node))
102-
// .filter(node => (tag ? isTagged(node, tag) : true)) as (
103-
// | ts.TemplateExpression
104-
// | ts.NoSubstitutionTemplateLiteral
105-
// )[];
106100
const nodes = this._helper.getAllNodes(fileName, node => getTemplateNodeUnder(node, tag));
107101
nodes.forEach(node => {
108102
const { resolvedInfo, resolveErrors } = this._helper.resolveTemplateLiteral(fileName, node);

src/graphql-language-service-adapter/get-completion-at-position.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export function getCompletionAtPosition(
3333
if (ctx.getScriptSourceHelper().isExcluded(fileName)) return delegate(fileName, position, options);
3434
const schema = ctx.getSchema();
3535
if (!schema) return delegate(fileName, position, options);
36-
const node = ctx.findTemplateNode(fileName, position);
36+
const node = ctx.findAscendantTemplateNode(fileName, position);
3737
if (!node) return delegate(fileName, position, options);
3838
const { resolvedInfo } = ctx.resolveTemplateInfo(fileName, node);
3939
if (!resolvedInfo) {

src/graphql-language-service-adapter/get-quick-info-at-position.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function getQuickInfoAtPosition(
1212
if (ctx.getScriptSourceHelper().isExcluded(fileName)) return delegate(fileName, position);
1313
const schema = ctx.getSchema();
1414
if (!schema) return delegate(fileName, position);
15-
const node = ctx.findTemplateNode(fileName, position);
15+
const node = ctx.findAscendantTemplateNode(fileName, position);
1616
if (!node) return delegate(fileName, position);
1717
const { resolvedInfo } = ctx.resolveTemplateInfo(fileName, node);
1818
if (!resolvedInfo) return delegate(fileName, position);

src/graphql-language-service-adapter/graphql-language-service-adapter.ts

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -87,49 +87,39 @@ export class GraphQLLanguageServiceAdapter {
8787
getExternalFragmentDefinitions: (documentStr, fileName, sourcePosition) =>
8888
this._fragmentRegisry.getExternalFragments(documentStr, fileName, sourcePosition),
8989
getDuplicaterdFragmentDefinitions: () => this._fragmentRegisry.getDuplicaterdFragmentDefinitions(),
90-
findTemplateNode: (fileName, position) => this._findTemplateNode(fileName, position),
90+
findAscendantTemplateNode: (fileName, position) => this._findAscendantTemplateNode(fileName, position),
9191
findTemplateNodes: fileName => this._findTemplateNodes(fileName),
9292
resolveTemplateInfo: (fileName, node) => this._resolveTemplateInfo(fileName, node),
9393
};
9494
return ctx;
9595
}
9696

97-
private _findTemplateNode(fileName: string, position: number) {
98-
const foundNode = this._helper.getNode(fileName, position);
99-
if (!foundNode) return;
100-
let node: ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression;
101-
if (ts.isNoSubstitutionTemplateLiteral(foundNode)) {
102-
node = foundNode;
103-
} else if (ts.isTemplateHead(foundNode) && !isTemplateLiteralTypeNode(foundNode.parent)) {
104-
node = foundNode.parent;
97+
private _findAscendantTemplateNode(fileName: string, position: number) {
98+
const nodeUnderCursor = this._helper.getNode(fileName, position);
99+
if (!nodeUnderCursor) return;
100+
101+
let templateNode: ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression;
102+
103+
if (ts.isNoSubstitutionTemplateLiteral(nodeUnderCursor)) {
104+
templateNode = nodeUnderCursor;
105+
} else if (ts.isTemplateHead(nodeUnderCursor) && !isTemplateLiteralTypeNode(nodeUnderCursor.parent)) {
106+
templateNode = nodeUnderCursor.parent;
105107
} else if (
106-
(ts.isTemplateMiddle(foundNode) || ts.isTemplateTail(foundNode)) &&
107-
!isTemplateLiteralTypeNode(foundNode.parent.parent)
108+
(ts.isTemplateMiddle(nodeUnderCursor) || ts.isTemplateTail(nodeUnderCursor)) &&
109+
!isTemplateLiteralTypeNode(nodeUnderCursor.parent.parent)
108110
) {
109-
node = foundNode.parent.parent;
111+
templateNode = nodeUnderCursor.parent.parent;
110112
} else {
111113
return;
112114
}
113-
// if (this._tagCondition && !isTagged(node, this._tagCondition)) {
114-
// return;
115-
// }
116-
if (!isTaggedTemplateNode(node, this._tagCondition)) {
115+
if (!isTaggedTemplateNode(templateNode, this._tagCondition)) {
117116
return;
118117
}
119-
return node;
118+
return templateNode;
120119
}
121120

122121
private _findTemplateNodes(fileName: string) {
123122
return this._helper.getAllNodes(fileName, node => getTemplateNodeUnder(node, this._tagCondition));
124-
// const allTemplateStringNodes = this._helper.getAllNodes(
125-
// fileName,
126-
// (n: ts.Node) => ts.isNoSubstitutionTemplateLiteral(n) || ts.isTemplateExpression(n),
127-
// );
128-
// const nodes = allTemplateStringNodes.filter(n => {
129-
// if (!this._tagCondition) return true;
130-
// return isTagged(n, this._tagCondition);
131-
// }) as (ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression)[];
132-
// return nodes;
133123
}
134124

135125
private _parse(text: string) {

src/graphql-language-service-adapter/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface AnalysisContext {
2020
): FragmentDefinitionNode[];
2121
getDuplicaterdFragmentDefinitions(): Set<string>;
2222
getGraphQLDocumentNode(text: string): DocumentNode | undefined;
23-
findTemplateNode(
23+
findAscendantTemplateNode(
2424
fileName: string,
2525
position: number,
2626
): ts.NoSubstitutionTemplateLiteral | ts.TemplateExpression | undefined;

src/language-service-plugin/plugin-module-factory.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,9 @@ function create(info: ts.server.PluginCreateInfo): ts.LanguageService {
3131
fragmentRegistry.registerDocuments(
3232
fileName,
3333
version,
34-
findAllNodes(sourceFile, node => {
35-
// if (tag && ts.isTaggedTemplateExpression(node) && hasTagged(node, tag, sourceFile)) {
36-
// return node.template;
37-
// } else if (ts.isNoSubstitutionTemplateLiteral(node) || ts.isTemplateExpression(node)) {
38-
// return node;
39-
// }
40-
return getTemplateNodeUnder(node, tag);
41-
}).map(node => getSanitizedTemplateText(node, sourceFile)),
34+
findAllNodes(sourceFile, node => getTemplateNodeUnder(node, tag)).map(node =>
35+
getSanitizedTemplateText(node, sourceFile),
36+
),
4237
);
4338
};
4439

0 commit comments

Comments
 (0)