More PR feedback

Author: riknoll

src/harness/fourslash.ts

@@ -1680,13 +1680,13 @@ namespace FourSlash {
             assertFn(actualCount, expectedCount, this.messageAtLastKnownMarker("Type definitions Count"));
         }
 
-        public verifyImplementationsCount(negative: boolean, expectedCount: number) {
+        public verifyImplementationListIsEmpty(negative: boolean) {
             const assertFn = negative ? assert.notEqual : assert.equal;
 
             const implementations = this.languageService.getImplementationAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             const actualCount = implementations && implementations.length || 0;
 
-            assertFn(actualCount, expectedCount, this.messageAtLastKnownMarker("Implementations Count"));
+            assertFn(actualCount, 0, this.messageAtLastKnownMarker("Implementations Count"));
         }
 
         public verifyGoToDefinitionName(expectedName: string, expectedContainerName: string) {
@@ -1697,26 +1697,22 @@ namespace FourSlash {
             assert.equal(actualDefinitionContainerName, expectedContainerName, this.messageAtLastKnownMarker("Definition Info Container Name"));
         }
 
-        public goToImplementation(implIndex?: number) {
+        public goToImplementation() {
             const implementations = this.languageService.getImplementationAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             if (!implementations || !implementations.length) {
                 this.raiseError("goToImplementation failed - expected to find at least one implementation location but got 0");
             }
-
-            if (implIndex === undefined && implementations.length > 1) {
-                this.raiseError(`goToImplementation failed - no index given but more than 1 implementation returned (${implementations.length})`);
-            }
-
-            if (implIndex >= implementations.length) {
-                this.raiseError(`goToImplementation failed - implIndex value (${implIndex}) exceeds implementation list size (${implementations.length})`);
+            if (implementations.length > 1) {
+                this.raiseError(`goToImplementation failed - more than 1 implementation returned (${implementations.length})`);
             }
 
-            const implementation = implementations[implIndex || 0];
+            const implementation = implementations[0];
             this.openFile(implementation.fileName);
             this.currentCaretPosition = implementation.textSpan.start;
         }
 
-        public verifyRangesInImplementationList() {
+        public verifyRangesInImplementationList(markerName: string) {
+            this.goToMarker(markerName);
             const implementations: ImplementationLocationInformation[] = this.languageService.getImplementationAtPosition(this.activeFile.fileName, this.currentCaretPosition);
             if (!implementations || !implementations.length) {
                 this.raiseError("verifyRangesInImplementationList failed - expected to find at least one implementation location but got 0");
@@ -2954,8 +2950,8 @@ namespace FourSlashInterface {
             this.state.goToTypeDefinition(definitionIndex);
         }
 
-        public implementation(implementationIndex?: number) {
-            this.state.goToImplementation(implementationIndex);
+        public implementation() {
+            this.state.goToImplementation();
         }
 
         public position(position: number, fileIndex?: number): void;
@@ -3062,8 +3058,8 @@ namespace FourSlashInterface {
             this.state.verifyTypeDefinitionsCount(this.negative, expectedCount);
         }
 
-        public implementationCountIs(expectedCount: number) {
-            this.state.verifyImplementationsCount(this.negative, expectedCount);
+        public implementationListIsEmpty() {
+            this.state.verifyImplementationListIsEmpty(this.negative);
         }
 
         public isValidBraceCompletionAtPosition(openingBrace: string) {
@@ -3319,8 +3315,8 @@ namespace FourSlashInterface {
             this.state.verifyProjectInfo(expected);
         }
 
-        public allRangesAppearInImplementationList() {
-            this.state.verifyRangesInImplementationList();
+        public allRangesAppearInImplementationList(markerName: string) {
+            this.state.verifyRangesInImplementationList(markerName);
         }
     }
 

src/services/services.ts

@@ -179,7 +179,7 @@ namespace ts {
 
         /**
          * Returns a JSON-encoded value of the type:
-         * { fileName: string; textSpan: { start: number; length: number}; isWriteAccess: boolean, isDefinition?: boolean }[]
+         * { fileName: string; textSpan: { start: number; length: number}; }[]
          */
         getImplementationAtPosition(fileName: string, position: number): string;
 

src/services/shims.ts

@@ -110,7 +110,7 @@ declare namespace FourSlashInterface {
         bof(): void;
         eof(): void;
         type(definitionIndex?: number): void;
-        implementation(implementationIndex?: number): void;
+        implementation(): void;
         position(position: number, fileIndex?: number): any;
         position(position: number, fileName?: string): any;
         file(index: number, content?: string, scriptKindName?: string): any;
@@ -134,7 +134,7 @@ declare namespace FourSlashInterface {
         quickInfoIs(expectedText?: string, expectedDocumentation?: string): void;
         quickInfoExists(): void;
         typeDefinitionCountIs(expectedCount: number): void;
-        implementationCountIs(expectedCount: number): void;
+        implementationListIsEmpty(): void;
         isValidBraceCompletionAtPosition(openingBrace?: string): void;
     }
     class verify extends verifyNegatable {
@@ -242,7 +242,7 @@ declare namespace FourSlashInterface {
         getSyntacticDiagnostics(expected: string): void;
         getSemanticDiagnostics(expected: string): void;
         ProjectInfo(expected: string[]): void;
-        allRangesAppearInImplementationList(): void;
+        allRangesAppearInImplementationList(markerName: string): void;
     }
     class edit {
         backspace(count?: number): void;

tests/cases/fourslash/fourslash.ts

@@ -8,5 +8,4 @@
 ////
 //// new Bar().hel/*reference*/lo;
 
-goTo.marker("reference");
-verify.allRangesAppearInImplementationList();
+verify.allRangesAppearInImplementationList("reference");

tests/cases/fourslash/goToImplementationClassMethod_00.ts

@@ -14,8 +14,5 @@
 ////     x.he/*reference*/llo();
 //// }
 
-goTo.marker("reference");
-verify.allRangesAppearInImplementationList();
-
-goTo.marker("declaration");
-verify.allRangesAppearInImplementationList();
+verify.allRangesAppearInImplementationList("reference");
+verify.allRangesAppearInImplementationList("declaration");

tests/cases/fourslash/goToImplementationClassMethod_01.ts

@@ -9,5 +9,4 @@
 ////
 //// Foo.Fo/*reference*/o1;
 
-goTo.marker("reference");
-verify.allRangesAppearInImplementationList();
+verify.allRangesAppearInImplementationList("reference");

tests/cases/fourslash/goToImplementationEnum_00.ts

@@ -9,5 +9,4 @@
 ////
 //// Fo/*reference*/o;
 
-goTo.marker("reference");
-verify.allRangesAppearInImplementationList();
+verify.allRangesAppearInImplementationList("reference");

tests/cases/fourslash/goToImplementationEnum_01.ts

@@ -21,8 +21,5 @@
 ////     constructor(public f: Foo = { [|hello() {/**3*/}|] } ) {}
 //// }
 
-goTo.marker("function_call");
-verify.allRangesAppearInImplementationList();
-
-goTo.marker("declaration");
-verify.allRangesAppearInImplementationList();
+verify.allRangesAppearInImplementationList("function_call");
+verify.allRangesAppearInImplementationList("declaration");

tests/cases/fourslash/goToImplementationInterfaceMethod_00.ts

@@ -18,8 +18,5 @@
 ////
 //// whatever(new Bar());
 
-goTo.marker("function_call");
-verify.allRangesAppearInImplementationList();
-
-goTo.marker("declaration");
-verify.allRangesAppearInImplementationList();
+verify.allRangesAppearInImplementationList("function_call");
+verify.allRangesAppearInImplementationList("declaration");