Use some string predicates that perform their own keyword lookup.

Author: DanielRosenwasser

src/services/codefixes/convertToEsModule.ts

@@ -50,10 +50,10 @@ import {
     isExportsOrModuleExportsOrAlias,
     isFunctionExpression,
     isIdentifier,
-    isNonContextualKeyword,
     isObjectLiteralExpression,
     isPropertyAccessExpression,
     isRequireCall,
+    isStringANonContextualKeyword,
     isVariableStatement,
     makeImport,
     map,
@@ -163,9 +163,7 @@ function collectExportRenames(sourceFile: SourceFile, checker: TypeChecker, iden
     const res = new Map<string, string>();
     forEachExportReference(sourceFile, node => {
         const text = node.name.text;
-        const keywordKind = stringToToken(text);
-        if (!res.has(text) && (keywordKind !== undefined && isNonContextualKeyword(keywordKind)
-            || checker.resolveName(text, node, SymbolFlags.Value, /*excludeGlobals*/ true))) {
+        if (!res.has(text) && (isStringANonContextualKeyword(text) || checker.resolveName(text, node, SymbolFlags.Value, /*excludeGlobals*/ true))) {
             // Unconditionally add an underscore in case `text` is a keyword.
             res.set(text, makeUniqueName(`_${text}`, identifiers));
         }

src/services/completions.ts

@@ -217,6 +217,7 @@ import {
     isStatement,
     isStatic,
     isString,
+    isStringAKeyword,
     isStringANonContextualKeyword,
     isStringLiteralLike,
     isStringLiteralOrTemplate,
@@ -4827,8 +4828,7 @@ function tryGetObjectTypeDeclarationCompletionContainer(sourceFile: SourceFile,
             }
             break;
        case SyntaxKind.Identifier: {
-            const originalKeywordKind = stringToToken((location as Identifier).text);
-            if (originalKeywordKind && isKeyword(originalKeywordKind)) {
+            if (isStringAKeyword((location as Identifier).text)) {
                 return undefined;
             }
             // class c { public prop = c| }