Relax check on TS path completion trigger

This commit is contained in:
Matt Bierner 2017-09-26 13:24:20 -07:00
parent a0139b47f4
commit 60470a533b

View file

@ -184,7 +184,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
if (context.triggerCharacter === '"' || context.triggerCharacter === '\'') {
// make sure we are in something that looks like the start of an import
const line = document.lineAt(position.line).text.slice(0, position.character);
if (!line.match(/^import .+? from\s*["']$/) && !line.match(/\b(import|require)\(['"]$/)) {
if (!line.match(/\bfrom\s*["']$/) && !line.match(/\b(import|require)\(['"]$/)) {
return Promise.resolve<CompletionItem[]>([]);
}
}
@ -192,7 +192,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
if (context.triggerCharacter === '/') {
// make sure we are in something that looks like an import path
const line = document.lineAt(position.line).text.slice(0, position.character);
if (!line.match(/^import .+? from\s*["'][^'"]*$/) && !line.match(/\b(import|require)\(['"][^'"]*$/)) {
if (!line.match(/\bfrom\s*["'][^'"]*$/) && !line.match(/\b(import|require)\(['"][^'"]*$/)) {
return Promise.resolve<CompletionItem[]>([]);
}
}