microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-11 10:46:28 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

merge conflict fixes; remove comments

Browse Source
This commit is contained in:
Gabriela Araujo Britto
2021-10-14 14:53:45 -07:00
parent b8bb27ad1a
commit 952aac1cdc
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/emitter.ts
View File

@@ -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);
}

16
src/services/completions.ts
View File

@@ -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,