From 952aac1cdcb1fcb6448665a6b2c4de1ac2e8f678 Mon Sep 17 00:00:00 2001
From: Gabriela Araujo Britto <gabrielaa@microsoft.com>
Date: Thu, 14 Oct 2021 14:53:45 -0700
Subject: [PATCH] merge conflict fixes; remove comments

---
 src/compiler/emitter.ts     |  5 +----
 src/services/completions.ts | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index caed89fa338..6724b25be36 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1311,9 +1311,6 @@ namespace ts {
                     return emitSnippetNode(hint, node, snippet);
                 }
             }
-            // else {
-            //     Debug.assert(!getSnippetElement(node), "A snippet cannot exist inside another snippet.");
-            // }
             if (hint === EmitHint.SourceFile) return emitSourceFile(cast(node, isSourceFile));
             if (hint === EmitHint.IdentifierName) return emitIdentifier(cast(node, isIdentifier));
             if (hint === EmitHint.JsxAttributeValue) return emitLiteral(cast(node, isStringLiteral), /*jsxAttributeEscape*/ true);
@@ -4547,7 +4544,7 @@ namespace ts {
             }
         }
 
-        function noEscapeWrite(s: string) { // >> update
+        function noEscapeWrite(s: string) {
             writer.write(s);
         }
 
diff --git a/src/services/completions.ts b/src/services/completions.ts
index 07f924700b1..8236ea772ff 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -990,8 +990,20 @@ namespace ts.Completions {
         }
     }
 
-    function originToCompletionEntryData(origin: SymbolOriginInfoExport): CompletionEntryData | undefined {
-        return {
+    function originToCompletionEntryData(origin: SymbolOriginInfoExport | SymbolOriginInfoResolvedExport): CompletionEntryData | undefined {
+        const ambientModuleName = origin.fileName ? undefined : stripQuotes(origin.moduleSymbol.name);
+        const isPackageJsonImport = origin.isFromPackageJson ? true : undefined;
+        if (originIsResolvedExport(origin)) {
+            const resolvedData: CompletionEntryDataResolved = {
+                exportName: origin.exportName,
+                moduleSpecifier: origin.moduleSpecifier,
+                ambientModuleName,
+                fileName: origin.fileName,
+                isPackageJsonImport,
+            };
+            return resolvedData;
+        }
+        const unresolvedData: CompletionEntryDataUnresolved = {
             exportName: origin.exportName,
             exportMapKey: origin.exportMapKey,
             fileName: origin.fileName,