diff --git a/package-lock.json b/package-lock.json index cdcf5a1..4789982 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,6 +27,19 @@ "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", "dev": true }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "requires": { + "tslib": "^1.8.1" + } + }, "typescript": { "version": "4.3.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", diff --git a/package.json b/package.json index 9a976c9..13b6da7 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "homepage": "https://github.com/Monchi/typescript-plugin-namespace-import#readme", "dependencies": { "camelcase": "^6.2.0", + "tsutils": "^3.21.0", "typescript": "^4.3.5" }, "devDependencies": { diff --git a/src/index.ts b/src/index.ts index 4c63a29..e008f4d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,5 @@ +import ts, { SemanticClassificationFormat } from 'typescript/lib/tsserverlibrary'; +import * as tsutils from 'tsutils'; import * as namespaceImportPlugin from './lib/import'; declare global { @@ -21,7 +23,14 @@ function init() { info.languageService.getCompletionsAtPosition = (fileName, position, options) => { log('getCompletionsAtPosition', { fileName, position, options }); const original = getCompletionsAtPosition(fileName, position, options); - if (original == null || options?.triggerCharacter != null) { + if ( + original == null || + options?.triggerCharacter != null || + !namespaceImportPlugin.isAutoCompletablePosition( + info.languageService.getProgram()?.getSourceFile(fileName), + position, + ) + ) { return original; } diff --git a/src/lib/import.ts b/src/lib/import.ts index 988cfcd..6a47bec 100644 --- a/src/lib/import.ts +++ b/src/lib/import.ts @@ -1,6 +1,7 @@ import ts, { CodeFixAction, ScriptElementKind } from 'typescript/lib/tsserverlibrary'; import * as path from 'path'; import camelCase from 'camelcase'; +import * as tsutils from 'tsutils'; export type PluginOptions = { paths: readonly string[]; @@ -44,6 +45,14 @@ export function filterNamedImportEntries( }); } +export function isAutoCompletablePosition(sourceFile: ts.SourceFile | undefined, position: number): boolean { + if (!sourceFile) { + return false; + } + const token = tsutils.getTokenAtPosition(sourceFile!, position)?.kind ?? ts.SyntaxKind.Unknown; + return token !== ts.SyntaxKind.StringLiteral; +} + export function getCompletionEntryDetails( name: string, selfPath: string, pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy