maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use test instead of match

Browse source
This commit is contained in:
Matt Bierner 2021-02-01 16:28:12 -08:00
parent 7490ac87e1
commit 60bb22ddd3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extensions/typescript-language-features/src/languageFeatures/completions.ts
View file

@ -740,7 +740,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
if ((context.triggerCharacter === '"' || context.triggerCharacter === '\'')) { if ((context.triggerCharacter === '"' || context.triggerCharacter === '\'')) {
// make sure we are in something that looks like the start of an import // make sure we are in something that looks like the start of an import
const pre = line.text.slice(0, position.character); const pre = line.text.slice(0, position.character);
if (!pre.match(/\b(from|import)\s*["']$/) && !pre.match(/\b(import|require)\(['"]$/)) { if (!/\b(from|import)\s*["']$/.test(pre) && !/\b(import|require)\(['"]$/.test(pre)) {
return false; return false;
} }
} }
@ -748,7 +748,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
if (context.triggerCharacter === '/') { if (context.triggerCharacter === '/') {
// make sure we are in something that looks like an import path // make sure we are in something that looks like an import path
const pre = line.text.slice(0, position.character); const pre = line.text.slice(0, position.character);
if (!pre.match(/\b(from|import)\s*["'][^'"]*$/) && !pre.match(/\b(import|require)\(['"][^'"]*$/)) { if (!/\b(from|import)\s*["'][^'"]*$/.test(pre) && !/\b(import|require)\(['"][^'"]*$/.test(pre)) {
return false; return false;
} }
} }
@ -756,7 +756,7 @@ class TypeScriptCompletionItemProvider implements vscode.CompletionItemProvider<
if (context.triggerCharacter === '@') { if (context.triggerCharacter === '@') {
// make sure we are in something that looks like the start of a jsdoc comment // make sure we are in something that looks like the start of a jsdoc comment
const pre = line.text.slice(0, position.character); const pre = line.text.slice(0, position.character);
if (!pre.match(/^\s*\*[ ]?@/) && !pre.match(/\/\*\*+[ ]?@/)) { if (!/^\s*\*[ ]?@/.test(pre) && !/\/\*\*+[ ]?@/.test(pre)) {
return false; return false;
} }
} }