[Release-2.0] Fix 9632 Auto-completion for quoted property in object literal expression

src/compiler/tsc.ts

@@ -130,7 +130,7 @@ namespace ts {
             const { line: firstLine, character: firstLineChar } = getLineAndCharacterOfPosition(file, start);
             const { line: lastLine, character: lastLineChar } = getLineAndCharacterOfPosition(file, start + length);
             const lastLineInFile = getLineAndCharacterOfPosition(file, file.text.length).line;
-            const relativeFileName = host ? convertToRelativePath(file.fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName)) : file.fileName;;
+            const relativeFileName = host ? convertToRelativePath(file.fileName, host.getCurrentDirectory(), fileName => host.getCanonicalFileName(fileName)) : file.fileName;
 
             const hasMoreThanFiveLines = (lastLine - firstLine) >= 4;
             let gutterWidth = (lastLine + 1 + "").length;

src/services/services.ts

@@ -4206,6 +4206,7 @@ namespace ts {
                     kindModifiers: getSymbolModifiers(symbol),
                     sortText: "0",
                 };
+
             }
 
             function getCompletionEntriesFromSymbols(symbols: Symbol[], entries: CompletionEntry[], location: Node, performCharacterChecks: boolean): Map<string> {
@@ -4234,22 +4235,58 @@ namespace ts {
                     return undefined;
                 }
 
-                const argumentInfo = SignatureHelp.getContainingArgumentInfo(node, position, sourceFile);
-                if (argumentInfo) {
-                    // Get string literal completions from specialized signatures of the target
-                    return getStringLiteralCompletionEntriesFromCallExpression(argumentInfo);
+                if (node.parent.kind === SyntaxKind.PropertyAssignment && node.parent.parent.kind === SyntaxKind.ObjectLiteralExpression) {
+                    // Get quoted name of properties of the object literal expression
+                    // i.e. interface ConfigFiles {
+                    //          'jspm:dev': string
+                    //      }
+                    //      let files: ConfigFiles = {
+                    //          '/*completion position*/'
+                    //      }
+                    //
+                    //      function foo(c: ConfigFiles) {}
+                    //      foo({
+                    //          '/*completion position*/'
+                    //      });
+                    return getStringLiteralCompletionEntriesFromPropertyAssignment(<ObjectLiteralElement>node.parent);
                 }
                 else if (isElementAccessExpression(node.parent) && node.parent.argumentExpression === node) {
                     // Get all names of properties on the expression
+                    // i.e. interface A {
+                    //      'prop1': string
+                    // }
+                    // let a: A;
+                    // a['/*completion position*/']
                     return getStringLiteralCompletionEntriesFromElementAccess(node.parent);
                 }
                 else {
-                    // Otherwise, get the completions from the contextual type if one exists
+                    const argumentInfo = SignatureHelp.getContainingArgumentInfo(node, position, sourceFile);
+                    if (argumentInfo) {
+                        // Get string literal completions from specialized signatures of the target
+                        // i.e. declare function f(a: 'A');
+                        // f("/*completion position*/")
+                        return getStringLiteralCompletionEntriesFromCallExpression(argumentInfo, node);
+                    }
+
+                    // Get completion for string literal from string literal type
+                    // i.e. var x: "hi" | "hello" = "/*completion position*/"
                     return getStringLiteralCompletionEntriesFromContextualType(<StringLiteral>node);
                 }
             }
 
-            function getStringLiteralCompletionEntriesFromCallExpression(argumentInfo: SignatureHelp.ArgumentListInfo) {
+            function getStringLiteralCompletionEntriesFromPropertyAssignment(element: ObjectLiteralElement) {
+                const typeChecker = program.getTypeChecker();
+                const type = typeChecker.getContextualType((<ObjectLiteralExpression>element.parent));
+                const entries: CompletionEntry[] = [];
+                if (type) {
+                    getCompletionEntriesFromSymbols(type.getApparentProperties(), entries, element, /*performCharacterChecks*/false);
+                    if (entries.length) {
+                        return { isMemberCompletion: true, isNewIdentifierLocation: true, entries };
+                    }
+                }
+            }
+
+            function getStringLiteralCompletionEntriesFromCallExpression(argumentInfo: SignatureHelp.ArgumentListInfo, location: Node) {
                 const typeChecker = program.getTypeChecker();
                 const candidates: Signature[] = [];
                 const entries: CompletionEntry[] = [];

tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts

@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts'/>
+
+//// export interface Configfiles {
+////   jspm: string;
+////   'jspm:browser': string;
+////   'jspm:dev': string;
+////   'jspm:node': string;
+//// }
+
+//// let files: Configfiles;
+//// files = {
+////    /*0*/: '',
+////    '/*1*/': ''
+//// }
+
+goTo.marker('0');
+verify.completionListContains("jspm");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(1);
+
+goTo.marker('1');
+verify.completionListContains("jspm:dev");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(4);

tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts

@@ -0,0 +1,30 @@
+/// <reference path='fourslash.ts'/>
+
+//// export interface Config {
+////    files: ConfigFiles
+//// }
+
+//// export interface ConfigFiles {
+////   jspm: string;
+////   'jspm:browser': string;
+////   'jspm:dev': string;
+////   'jspm:node': string;
+//// }
+
+//// let config: Config;
+//// config = {
+////    files: {
+////        /*0*/: '',
+////        '/*1*/': ''
+////    }
+//// }
+
+goTo.marker('0');
+verify.completionListContains("jspm");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(1);
+
+goTo.marker('1');
+verify.completionListContains("jspm:dev");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(4);

tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts

@@ -0,0 +1,26 @@
+/// <reference path='fourslash.ts'/>
+
+////  let configFiles1: {
+////      jspm: string;
+////      'jspm:browser': string;
+////  } = {
+////          /*0*/: "", 
+////  }
+
+////  let configFiles2: {
+////      jspm: string;
+////      'jspm:browser': string;
+////  } = {
+////         jspm: "",
+////         '/*1*/': "" 
+////  }
+
+goTo.marker('0');
+verify.completionListContains("jspm");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(1);
+
+goTo.marker('1');
+verify.completionListContains("jspm:browser");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(2);

tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts

@@ -0,0 +1,24 @@
+/// <reference path='fourslash.ts'/>
+
+//// export interface ConfigFiles {
+////   jspm: string;
+////   'jspm:browser': string;
+////   'jspm:dev': string;
+////   'jspm:node': string;
+//// }
+
+//// function foo(c: ConfigFiles) {}
+//// foo({
+////     j/*0*/: "",
+////     "/*1*/": "",
+//// })
+
+goTo.marker('0');
+verify.completionListContains("jspm");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(1);
+
+goTo.marker('1');
+verify.completionListContains("jspm:dev");
+verify.completionListAllowsNewIdentifier();
+verify.memberListCount(4);