From 8965650bc332a8b86db77c8183098c9d8b511df1 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.tarasyuk@outlook.com>
Date: Sun, 12 May 2019 23:14:18 +0300
Subject: [PATCH] ignore trigger chars within a string literal

---
 src/services/completions.ts                   |  4 ++-
 .../completionsStringsWithTriggerCharacter.ts | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 tests/cases/fourslash/completionsStringsWithTriggerCharacter.ts

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 9d569fbedde4f..0d69f5951f856 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -40,7 +40,9 @@ namespace ts.Completions {
         const compilerOptions = program.getCompilerOptions();
 
         const contextToken = findPrecedingToken(position, sourceFile);
-        if (triggerCharacter && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position)) return undefined;
+        if (triggerCharacter && !isInString(sourceFile, position, contextToken) && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position)) {
+            return undefined;
+        }
 
         const stringCompletions = StringCompletions.getStringLiteralCompletions(sourceFile, position, contextToken, typeChecker, compilerOptions, host, log, preferences);
         if (stringCompletions) {
diff --git a/tests/cases/fourslash/completionsStringsWithTriggerCharacter.ts b/tests/cases/fourslash/completionsStringsWithTriggerCharacter.ts
new file mode 100644
index 0000000000000..277218305f4a1
--- /dev/null
+++ b/tests/cases/fourslash/completionsStringsWithTriggerCharacter.ts
@@ -0,0 +1,30 @@
+/// <reference path="fourslash.ts" />
+
+//// type A = "a/b" | "b/a";
+//// const a: A = "a/*1*/";
+////
+//// type B = "a@b" | "b@a";
+//// const a: B = "a@/*2*/";
+////
+//// type C = "a.b" | "b.a";
+//// const c: C = "a./*3*/";
+////
+//// type D = "a'b" | "b'a";
+//// const d: D = "a'/*4*/";
+////
+//// type E = "a`b" | "b`a";
+//// const e: E = "a`/*5*/";
+////
+//// type F = 'a"b' | 'b"a';
+//// const f: F = 'a"/*6*/';
+////
+//// type G = "a<b" | "b<a";
+//// const g: G = 'a</*7*/';
+
+verify.completions({ marker: '1', exact: ["a/b", "b/a"], triggerCharacter: "/" });
+verify.completions({ marker: "2", exact: ["a@b", "b@a"], triggerCharacter: "@" });
+verify.completions({ marker: "3", exact: ["a.b", "b.a"], triggerCharacter: "." });
+verify.completions({ marker: "4", exact: ["a'b", "b'a"], triggerCharacter: "'" });
+verify.completions({ marker: "5", exact: ["a`b", "b`a"], triggerCharacter: "`" });
+verify.completions({ marker: "6", exact: ['a"b', 'b"a'], triggerCharacter: '"' });
+verify.completions({ marker: "7", exact: ["a<b", "b<a"], triggerCharacter: '<' });