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

Fix bug for isValidTrigger when contextToken is undefined (#25993)

Browse source
This commit is contained in:
Andy 2018-07-26 17:26:58 -07:00 committed by GitHub
parent 0e5af11625
commit af3f737451
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/services/completions.ts
View file

@ -42,7 +42,7 @@ namespace ts.Completions {
}
const contextToken = findPrecedingToken(position, sourceFile);
if (triggerCharacter && !isValidTrigger(sourceFile, triggerCharacter, contextToken!, position)) return undefined; // TODO: GH#18217
if (triggerCharacter && (!contextToken || !isValidTrigger(sourceFile, triggerCharacter, contextToken, position))) return undefined;
if (isInString(sourceFile, position, contextToken)) {
return !contextToken || !isStringLiteralLike(contextToken)

3
tests/cases/fourslash/completionsTriggerCharacter.ts
View file

@ -2,6 +2,7 @@
// @jsx: preserve
//////</*comment*/
////const x: "a" | "b" = "/*openQuote*/"/*closeQuote*/;
////const y: 'a' | 'b' = '/*openSingleQuote*/'/*closeSingleQuote*/;
////const z: 'a' | 'b' = `/*openTemplate*/`/*closeTemplate*/;
@ -28,6 +29,8 @@
////const divide = 1 //*divide*/
verify.completions(
{ marker: "comment", exact: undefined, triggerCharacter: "<" },
{ marker: "openQuote", exact: ["a", "b"], triggerCharacter: '"' },
{ marker: "closeQuote", exact: undefined, triggerCharacter: '"' },