Skip to content

refactor(vscode-extension): remove duplicated getTokenAtPosition in c… #68893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erkamyaman wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −20
Open

refactor(vscode-extension): remove duplicated getTokenAtPosition in c… #68893

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 1 addition & 20 deletions vscode-ng-language-service/server/src/handlers/completions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,14 @@ import {TextDocument} from 'vscode-languageserver-textdocument';
import {Session} from '../session';
import {getSCSSVirtualContent, isInlineStyleNode} from '../embedded_support';
import {
getTokenAtPosition,
lspPositionToTsPosition,
tsFileTextChangesToLspWorkspaceEdit,
tsTextSpanToLspRange,
} from '../utils';
import {documentationToMarkdown} from '../text_render';

const scssLS = getSCSSLanguageService();
// TODO: Share this or import it if possible, but it's local in session.ts usually.
// For now, duplicating the simple helper or need to find a way to share `defaultPreferences`.

// We need to access private/internal methods of Session if possible, or move them.
// getTokenAtPosition was added to session.ts recently. We should move it to utils or export it.

export function onCompletion(
session: Session,
Expand Down Expand Up @@ -69,9 +65,6 @@ export function onCompletion(
if (!sf) {
return null;
}
// We need getTokenAtPosition. It is currently in session.ts.
// I should move it to utils.ts first or duplicate it (bad).
// Let's assume I will move it to utils.ts in the next step.
const node = getTokenAtPosition(sf, offset);
if (!isInlineStyleNode(node)) {
return null;
Expand Down Expand Up @@ -148,18 +141,6 @@ export function onCompletionResolve(
return item;
}

function getTokenAtPosition(sourceFile: ts.SourceFile, position: number): ts.Node {
let current: ts.Node = sourceFile;
while (true) {
const child = current
.getChildren(sourceFile)
.find((c) => c.getStart(sourceFile) <= position && c.getEnd() > position);
if (!child || child.kind === ts.SyntaxKind.EndOfFileToken) {
return current;
}
current = child;
}
}
// TODO: Move this to `@angular/language-service`.
enum CompletionKind {
attribute = 'attribute',
Expand Down
Loading