maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed some warts

Browse source
This commit is contained in:
Arthur Ozga 2015-07-21 16:20:17 -07:00
parent b244d0d263
commit d7e6fba4d3
2 changed files with 8 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/harness/fourslash.ts
View file

@ -1875,7 +1875,7 @@ module FourSlash {
}
}
private verifyProjectInfo(expected: string[]) {
public verifyProjectInfo(expected: string[]) {
if (this.testType === FourSlashTestType.Server) {
let actual = (<ts.server.SessionClient>this.languageService).getProjectInfo(
this.activeFile.fileName,
@ -2057,11 +2057,8 @@ module FourSlash {
return result;
}
public verifGetScriptLexicalStructureListContains(
name: string,
kind: string,
markerPosition?: number) {
this.taoInvalidReason = 'verifGetScriptLexicalStructureListContains impossible';
public verifyGetScriptLexicalStructureListContains(name: string, kind: string) {
this.taoInvalidReason = 'verifyGetScriptLexicalStructureListContains impossible';
let items = this.languageService.getNavigationBarItems(this.activeFile.fileName);
@ -2263,7 +2260,7 @@ module FourSlash {
return 'line ' + (pos.line + 1) + ', col ' + pos.character;
}
private getMarkerByName(markerName: string) {
public getMarkerByName(markerName: string) {
let markerPos = this.testData.markerPositions[markerName];
if (markerPos === undefined) {
let markerNames: string[] = [];
@ -2738,4 +2735,4 @@ module FourSlash {
fileName: fileName
};
}
}
}

25
tests/cases/fourslash/fourslash.ts
View file

@ -1,4 +1,4 @@
/// <reference path="../../../src/harness/fourslashRunner.ts"/>
/// <reference path="../../../src/harness/fourslash.ts"/>
// declare var FourSlash;
// module ts {
@ -60,7 +60,6 @@ enum EmitReturnStatus {
}
module FourSlashInterface {
declare var FourSlash;
export interface Marker {
fileName: string;
@ -219,15 +218,6 @@ module FourSlashInterface {
FourSlash.currentTestState.verifyReferencesAtPositionListContains(range.fileName, range.start, range.end, isWriteAccess);
}
public implementorsCountIs(count: number) {
FourSlash.currentTestState.verifyImplementorsCountIs(count);
}
// Add tests for this.
public currentParameterIsVariable() {
FourSlash.currentTestState.verifyCurrentParameterIsVariable(!this.negative);
}
public signatureHelpPresent() {
FourSlash.currentTestState.verifySignatureHelpPresent(!this.negative);
}
@ -379,14 +369,11 @@ module FourSlashInterface {
FourSlash.currentTestState.verifyNoMatchingBracePosition(bracePosition);
}
public setVerifyDocComments(val: boolean) {
FourSlash.currentTestState.setVerifyDocComments(val);
}
public getScriptLexicalStructureListCount(count: number) {
FourSlash.currentTestState.verifyGetScriptLexicalStructureListCount(count);
}
// TODO: figure out what to do with the unused arguments.
public getScriptLexicalStructureListContains(
name: string,
kind: string,
@ -394,13 +381,7 @@ module FourSlashInterface {
parentName?: string,
isAdditionalSpan?: boolean,
markerPosition?: number) {
FourSlash.currentTestState.verifGetScriptLexicalStructureListContains(
name,
kind,
fileName,
parentName,
isAdditionalSpan,
markerPosition);
FourSlash.currentTestState.verifyGetScriptLexicalStructureListContains(name, kind);
}
public navigationItemsListCount(count: number, searchValue: string, matchKind?: string) {