From 5e3c96bb9acf41d22af08ce682c05f5ee4394e63 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 12 Jun 2018 15:36:53 -0700 Subject: [PATCH 1/5] Implemented support for trigger characters in signature help. --- src/harness/fourslash.ts | 49 +++++++++++-------- src/harness/harnessLanguageService.ts | 4 +- src/server/editorServices.ts | 2 +- src/server/protocol.ts | 11 +++++ src/server/scriptInfo.ts | 2 +- src/server/session.ts | 2 +- src/services/services.ts | 20 ++++---- src/services/shims.ts | 6 +-- src/services/signatureHelp.ts | 7 ++- src/services/types.ts | 19 +++++-- .../cancellableLanguageServiceOperations.ts | 2 +- .../unittests/extractTestHelpers.ts | 4 +- src/testRunner/unittests/organizeImports.ts | 4 +- .../unittests/tsserverProjectSystem.ts | 14 +++--- tests/cases/fourslash/fourslash.ts | 4 +- ...ignatureHelpFilteredTriggerCharacters01.ts | 15 ++++++ 16 files changed, 109 insertions(+), 56 deletions(-) create mode 100644 tests/cases/fourslash/signatureHelpFilteredTriggerCharacters01.ts diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 8045f3a948baf..32d5d6d4096d2 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -1435,16 +1435,15 @@ Actual: ${stringify(fullActual)}`); } } - public verifyNoSignatureHelp(markers: ReadonlyArray) { + public verifyNoSignatureHelp(triggerCharacter: ts.SignatureHelpTriggerCharacter | undefined, markers: ReadonlyArray) { if (markers.length) { for (const marker of markers) { this.goToMarker(marker); - this.verifyNoSignatureHelp(ts.emptyArray); + this.verifyNoSignatureHelp(triggerCharacter, ts.emptyArray); } return; } - - const actual = this.getSignatureHelp(); + const actual = this.getSignatureHelp({ triggerCharacter }); if (actual) { this.raiseError(`Expected no signature help, but got "${stringify(actual)}"`); } @@ -1465,7 +1464,7 @@ Actual: ${stringify(fullActual)}`); } private verifySignatureHelpWorker(options: FourSlashInterface.VerifySignatureHelpOptions) { - const help = this.getSignatureHelp()!; + const help = this.getSignatureHelp({ triggerCharacter: options.triggerCharacter })!; const selectedItem = help.items[help.selectedItemIndex]; // Argument index may exceed number of parameters const currentParameter = selectedItem.parameters[help.argumentIndex] as ts.SignatureHelpParameter | undefined; @@ -1507,6 +1506,7 @@ Actual: ${stringify(fullActual)}`); const allKeys: ReadonlyArray = [ "marker", + "triggerCharacter", "overloadsCount", "docComment", "text", @@ -1733,7 +1733,7 @@ Actual: ${stringify(fullActual)}`); } public printCurrentParameterHelp() { - const help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition); + const help = this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition, /*options*/ undefined); Harness.IO.log(stringify(help)); } @@ -1774,12 +1774,14 @@ Actual: ${stringify(fullActual)}`); } public printCurrentSignatureHelp() { - const help = this.getSignatureHelp()!; + const help = this.getSignatureHelp(ts.emptyOptions)!; Harness.IO.log(stringify(help.items[help.selectedItemIndex])); } - private getSignatureHelp(): ts.SignatureHelpItems | undefined { - return this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition); + private getSignatureHelp({ triggerCharacter }: FourSlashInterface.VerifySignatureHelpOptions): ts.SignatureHelpItems | undefined { + return this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition, { + triggerCharacter + }); } public printCompletionListMembers(preferences: ts.UserPreferences | undefined) { @@ -1875,13 +1877,13 @@ Actual: ${stringify(fullActual)}`); offset++; if (highFidelity) { - if (ch === "(" || ch === ",") { + if (ch === "(" || ch === "," || ch === "<") { /* Signature help*/ - this.languageService.getSignatureHelpItems(this.activeFile.fileName, offset); + this.languageService.getSignatureHelpItems(this.activeFile.fileName, offset, { triggerCharacter: ch }); } else if (prevChar === " " && /A-Za-z_/.test(ch)) { /* Completions */ - this.languageService.getCompletionsAtPosition(this.activeFile.fileName, offset, ts.defaultPreferences); + this.languageService.getCompletionsAtPosition(this.activeFile.fileName, offset, ts.emptyOptions); } if (i % checkCadence === 0) { @@ -2514,7 +2516,7 @@ Actual: ${stringify(fullActual)}`); `Expected '${fixId}'. Available action ids: ${ts.mapDefined(this.getCodeFixes(this.activeFile.fileName), a => a.fixId)}`); ts.Debug.assertEqual(fixWithId!.fixAllDescription, fixAllDescription); - const { changes, commands } = this.languageService.getCombinedCodeFix({ type: "file", fileName: this.activeFile.fileName }, fixId, this.formatCodeSettings, ts.defaultPreferences); + const { changes, commands } = this.languageService.getCombinedCodeFix({ type: "file", fileName: this.activeFile.fileName }, fixId, this.formatCodeSettings, ts.emptyOptions); assert.deepEqual | undefined>(commands, expectedCommands); assert(changes.every(c => c.fileName === this.activeFile.fileName), "TODO: support testing codefixes that touch multiple files"); this.applyChanges(changes); @@ -2594,7 +2596,7 @@ Actual: ${stringify(fullActual)}`); * Rerieves a codefix satisfying the parameters, or undefined if no such codefix is found. * @param fileName Path to file where error should be retrieved from. */ - private getCodeFixes(fileName: string, errorCode?: number, preferences: ts.UserPreferences = ts.defaultPreferences): ts.CodeFixAction[] { + private getCodeFixes(fileName: string, errorCode?: number, preferences: ts.UserPreferences = ts.emptyOptions): ts.CodeFixAction[] { const diagnosticsForCodeFix = this.getDiagnostics(fileName, /*includeSuggestions*/ true).map(diagnostic => ({ start: diagnostic.start, length: diagnostic.length, @@ -3072,7 +3074,7 @@ Actual: ${stringify(fullActual)}`); this.raiseError(`Expected action description to be ${JSON.stringify(actionDescription)}, got: ${JSON.stringify(action.description)}`); } - const editInfo = this.languageService.getEditsForRefactor(this.activeFile.fileName, this.formatCodeSettings, range, refactorName, actionName, ts.defaultPreferences)!; + const editInfo = this.languageService.getEditsForRefactor(this.activeFile.fileName, this.formatCodeSettings, range, refactorName, actionName, ts.emptyOptions)!; for (const edit of editInfo.edits) { this.applyEdits(edit.fileName, edit.textChanges, /*isFormattingEdit*/ false); } @@ -3124,7 +3126,7 @@ Actual: ${stringify(fullActual)}`); const action = ts.first(refactor.actions); assert(action.name === "Move to a new file" && action.description === "Move to a new file"); - const editInfo = this.languageService.getEditsForRefactor(this.activeFile.fileName, this.formatCodeSettings, range, refactor.name, action.name, options.preferences || ts.defaultPreferences)!; + const editInfo = this.languageService.getEditsForRefactor(this.activeFile.fileName, this.formatCodeSettings, range, refactor.name, action.name, options.preferences || ts.emptyOptions)!; this.testNewFileContents(editInfo.edits, options.newFileContents); } @@ -3162,14 +3164,14 @@ Actual: ${stringify(fullActual)}`); formattingOptions = formattingOptions || this.formatCodeSettings; const markerPos = this.getMarkerByName(markerName).position; - const applicableRefactors = this.languageService.getApplicableRefactors(this.activeFile.fileName, markerPos, ts.defaultPreferences); + const applicableRefactors = this.languageService.getApplicableRefactors(this.activeFile.fileName, markerPos, ts.emptyOptions); const applicableRefactorToApply = ts.find(applicableRefactors, refactor => refactor.name === refactorNameToApply); if (!applicableRefactorToApply) { this.raiseError(`The expected refactor: ${refactorNameToApply} is not available at the marker location.`); } - const editInfo = this.languageService.getEditsForRefactor(this.activeFile.fileName, formattingOptions, markerPos, refactorNameToApply, actionName, ts.defaultPreferences)!; + const editInfo = this.languageService.getEditsForRefactor(this.activeFile.fileName, formattingOptions, markerPos, refactorNameToApply, actionName, ts.emptyOptions)!; for (const edit of editInfo.edits) { this.applyEdits(edit.fileName, edit.textChanges, /*isFormattingEdit*/ false); @@ -3358,11 +3360,11 @@ Actual: ${stringify(fullActual)}`); } public getEditsForFileRename(options: FourSlashInterface.GetEditsForFileRenameOptions): void { - const changes = this.languageService.getEditsForFileRename(options.oldPath, options.newPath, this.formatCodeSettings, ts.defaultPreferences); + const changes = this.languageService.getEditsForFileRename(options.oldPath, options.newPath, this.formatCodeSettings, ts.emptyOptions); this.testNewFileContents(changes, options.newFileContents); } - private getApplicableRefactors(positionOrRange: number | ts.TextRange, preferences = ts.defaultPreferences): ReadonlyArray { + private getApplicableRefactors(positionOrRange: number | ts.TextRange, preferences = ts.emptyOptions): ReadonlyArray { return this.languageService.getApplicableRefactors(this.activeFile.fileName, positionOrRange, preferences) || ts.emptyArray; } } @@ -4038,7 +4040,11 @@ namespace FourSlashInterface { } public noSignatureHelp(...markers: string[]): void { - this.state.verifyNoSignatureHelp(markers); + this.state.verifyNoSignatureHelp(/*triggerCharacter*/ undefined, markers); + } + + public noSignatureHelpForTriggerCharacter(triggerCharacter: ts.SignatureHelpTriggerCharacter, ...markers: string[]): void { + this.state.verifyNoSignatureHelp(triggerCharacter, markers); } public signatureHelp(...options: VerifySignatureHelpOptions[]): void { @@ -4765,6 +4771,7 @@ namespace FourSlashInterface { readonly isVariadic?: boolean; /** @default ts.emptyArray */ readonly tags?: ReadonlyArray; + readonly triggerCharacter?: ts.SignatureHelpTriggerCharacter; } export type ArrayOrSingle = T | ReadonlyArray; diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts index bb476ee699ae3..885699215a593 100644 --- a/src/harness/harnessLanguageService.ts +++ b/src/harness/harnessLanguageService.ts @@ -434,8 +434,8 @@ namespace Harness.LanguageService { getBreakpointStatementAtPosition(fileName: string, position: number): ts.TextSpan { return unwrapJSONCallResult(this.shim.getBreakpointStatementAtPosition(fileName, position)); } - getSignatureHelpItems(fileName: string, position: number): ts.SignatureHelpItems { - return unwrapJSONCallResult(this.shim.getSignatureHelpItems(fileName, position)); + getSignatureHelpItems(fileName: string, position: number, options: ts.SignatureHelpItemsOptions | undefined): ts.SignatureHelpItems { + return unwrapJSONCallResult(this.shim.getSignatureHelpItems(fileName, position, options)); } getRenameInfo(fileName: string, position: number): ts.RenameInfo { return unwrapJSONCallResult(this.shim.getRenameInfo(fileName, position)); diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 77e5b2ed8294d..bba0ccee9b924 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -471,7 +471,7 @@ namespace ts.server { this.hostConfiguration = { formatCodeOptions: getDefaultFormatCodeSettings(this.host), - preferences: defaultPreferences, + preferences: emptyOptions, hostInfo: "Unknown host", extraFileExtensions: [] }; diff --git a/src/server/protocol.ts b/src/server/protocol.ts index 3082dbae6aa1e..af8702f67edbb 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -1787,6 +1787,10 @@ namespace ts.server.protocol { * Optional prefix to apply to possible completions. */ prefix?: string; + /** + * Character that was responsible for triggering completion. + * Should be `undefined` if a user manually requested completion. + */ triggerCharacter?: CompletionsTriggerCharacter; /** * @deprecated Use UserPreferences.includeCompletionsForModuleExports @@ -2048,10 +2052,17 @@ namespace ts.server.protocol { argumentCount: number; } + export type SignatureHelpTriggerCharacter = "," | "(" | "<"; + /** * Arguments of a signature help request. */ export interface SignatureHelpRequestArgs extends FileLocationRequestArgs { + /** + * Character that was responsible for triggering signature help. + * Should be `undefined` if a user manually requested completion. + */ + triggerCharacter?: SignatureHelpTriggerCharacter; } /** diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts index e8f1d931ac2af..37e07dbd7e872 100644 --- a/src/server/scriptInfo.ts +++ b/src/server/scriptInfo.ts @@ -419,7 +419,7 @@ namespace ts.server { if (preferences) { if (!this.preferences) { - this.preferences = defaultPreferences; + this.preferences = emptyOptions; } this.preferences = { ...this.preferences, ...preferences }; } diff --git a/src/server/session.ts b/src/server/session.ts index 88980367e8424..c8e9b320b6d50 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -1398,7 +1398,7 @@ namespace ts.server { const { file, project } = this.getFileAndProject(args); const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!; const position = this.getPosition(args, scriptInfo); - const helpItems = project.getLanguageService().getSignatureHelpItems(file, position); + const helpItems = project.getLanguageService().getSignatureHelpItems(file, position, args); if (!helpItems) { return undefined; } diff --git a/src/services/services.ts b/src/services/services.ts index db0213ed88ac5..46f724e520e2a 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1425,7 +1425,7 @@ namespace ts { return [...program.getOptionsDiagnostics(cancellationToken), ...program.getGlobalDiagnostics(cancellationToken)]; } - function getCompletionsAtPosition(fileName: string, position: number, options: GetCompletionsAtPositionOptions = defaultPreferences): CompletionInfo | undefined { + function getCompletionsAtPosition(fileName: string, position: number, options: GetCompletionsAtPositionOptions = emptyOptions): CompletionInfo | undefined { // Convert from deprecated options names to new names const fullPreferences: UserPreferences = { ...identity(options), // avoid excess property check @@ -1443,7 +1443,7 @@ namespace ts { options.triggerCharacter); } - function getCompletionEntryDetails(fileName: string, position: number, name: string, formattingOptions: FormatCodeSettings | undefined, source: string | undefined, preferences: UserPreferences = defaultPreferences): CompletionEntryDetails | undefined { + function getCompletionEntryDetails(fileName: string, position: number, name: string, formattingOptions: FormatCodeSettings | undefined, source: string | undefined, preferences: UserPreferences = emptyOptions): CompletionEntryDetails | undefined { synchronizeHostData(); return Completions.getCompletionEntryDetails( program, @@ -1769,12 +1769,12 @@ namespace ts { /** * This is a semantic operation. */ - function getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems | undefined { + function getSignatureHelpItems(fileName: string, position: number, { triggerCharacter }: SignatureHelpItemsOptions = emptyOptions): SignatureHelpItems | undefined { synchronizeHostData(); const sourceFile = getValidSourceFile(fileName); - return SignatureHelp.getSignatureHelpItems(program, sourceFile, position, cancellationToken); + return SignatureHelp.getSignatureHelpItems(program, sourceFile, position, triggerCharacter, cancellationToken); } /// Syntactic features @@ -1953,7 +1953,7 @@ namespace ts { return []; } - function getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: ReadonlyArray, formatOptions: FormatCodeSettings, preferences: UserPreferences = defaultPreferences): ReadonlyArray { + function getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: ReadonlyArray, formatOptions: FormatCodeSettings, preferences: UserPreferences = emptyOptions): ReadonlyArray { synchronizeHostData(); const sourceFile = getValidSourceFile(fileName); const span = createTextSpanFromBounds(start, end); @@ -1965,7 +1965,7 @@ namespace ts { }); } - function getCombinedCodeFix(scope: CombinedCodeFixScope, fixId: {}, formatOptions: FormatCodeSettings, preferences: UserPreferences = defaultPreferences): CombinedCodeActions { + function getCombinedCodeFix(scope: CombinedCodeFixScope, fixId: {}, formatOptions: FormatCodeSettings, preferences: UserPreferences = emptyOptions): CombinedCodeActions { synchronizeHostData(); Debug.assert(scope.type === "file"); const sourceFile = getValidSourceFile(scope.fileName); @@ -1974,7 +1974,7 @@ namespace ts { return codefix.getAllFixes({ fixId, sourceFile, program, host, cancellationToken, formatContext, preferences }); } - function organizeImports(scope: OrganizeImportsScope, formatOptions: FormatCodeSettings, preferences: UserPreferences = defaultPreferences): ReadonlyArray { + function organizeImports(scope: OrganizeImportsScope, formatOptions: FormatCodeSettings, preferences: UserPreferences = emptyOptions): ReadonlyArray { synchronizeHostData(); Debug.assert(scope.type === "file"); const sourceFile = getValidSourceFile(scope.fileName); @@ -1983,7 +1983,7 @@ namespace ts { return OrganizeImports.organizeImports(sourceFile, formatContext, host, program, preferences); } - function getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings, preferences: UserPreferences = defaultPreferences): ReadonlyArray { + function getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings, preferences: UserPreferences = emptyOptions): ReadonlyArray { return ts.getEditsForFileRename(getProgram()!, oldFilePath, newFilePath, host, formatting.getFormatContext(formatOptions), preferences); } @@ -2233,7 +2233,7 @@ namespace ts { }; } - function getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences = defaultPreferences): ApplicableRefactorInfo[] { + function getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences = emptyOptions): ApplicableRefactorInfo[] { synchronizeHostData(); const file = getValidSourceFile(fileName); return refactor.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences)); @@ -2245,7 +2245,7 @@ namespace ts { positionOrRange: number | TextRange, refactorName: string, actionName: string, - preferences: UserPreferences = defaultPreferences, + preferences: UserPreferences = emptyOptions, ): RefactorEditInfo | undefined { synchronizeHostData(); const file = getValidSourceFile(fileName); diff --git a/src/services/shims.ts b/src/services/shims.ts index 0ea27b4151f79..0776f55c9058f 100644 --- a/src/services/shims.ts +++ b/src/services/shims.ts @@ -158,7 +158,7 @@ namespace ts { getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): string; getBreakpointStatementAtPosition(fileName: string, position: number): string; - getSignatureHelpItems(fileName: string, position: number): string; + getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): string; /** * Returns a JSON-encoded value of the type: @@ -769,10 +769,10 @@ namespace ts { /// SIGNATUREHELP - public getSignatureHelpItems(fileName: string, position: number): string { + public getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): string { return this.forwardJSONCall( `getSignatureHelpItems('${fileName}', ${position})`, - () => this.languageService.getSignatureHelpItems(fileName, position) + () => this.languageService.getSignatureHelpItems(fileName, position, options) ); } diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts index ac13a2c790447..a183cdab1b4e8 100644 --- a/src/services/signatureHelp.ts +++ b/src/services/signatureHelp.ts @@ -19,7 +19,7 @@ namespace ts.SignatureHelp { argumentCount: number; } - export function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, cancellationToken: CancellationToken): SignatureHelpItems | undefined { + export function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, triggerCharacter: SignatureHelpTriggerCharacter | undefined, cancellationToken: CancellationToken): SignatureHelpItems | undefined { const typeChecker = program.getTypeChecker(); // Decide whether to show signature help @@ -29,6 +29,11 @@ namespace ts.SignatureHelp { return undefined; } + // In the middle of a string, don't provide signature help unless the user explicitly requested it. + if (triggerCharacter !== undefined && isInString(sourceFile, position, startingToken)) { + return undefined; + } + const argumentInfo = getContainingArgumentInfo(startingToken, position, sourceFile); if (!argumentInfo) return undefined; diff --git a/src/services/types.ts b/src/services/types.ts index 9ae51a4ea6155..16476c795b08f 100644 --- a/src/services/types.ts +++ b/src/services/types.ts @@ -242,7 +242,7 @@ namespace ts { readonly allowTextChangesInNewFiles?: boolean; } /* @internal */ - export const defaultPreferences: UserPreferences = {}; + export const emptyOptions = {}; // // Public services of a language service instance associated @@ -292,7 +292,7 @@ namespace ts { getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan | undefined; - getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems | undefined; + getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): SignatureHelpItems | undefined; getRenameInfo(fileName: string, position: number): RenameInfo; findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[] | undefined; @@ -371,7 +371,10 @@ namespace ts { export type CompletionsTriggerCharacter = "." | '"' | "'" | "`" | "/" | "@" | "<"; export interface GetCompletionsAtPositionOptions extends UserPreferences { - /** If the editor is asking for completions because a certain character was typed, and not because the user explicitly requested them, this should be set. */ + /** + * If the editor is asking for completions because a certain character was typed + * (as opposed to when the user explicitly requested them) this should be set. + */ triggerCharacter?: CompletionsTriggerCharacter; /** @deprecated Use includeCompletionsForModuleExports */ includeExternalModuleExports?: boolean; @@ -379,6 +382,16 @@ namespace ts { includeInsertTextCompletions?: boolean; } + export type SignatureHelpTriggerCharacter = "," | "(" | "<"; + + export interface SignatureHelpItemsOptions { + /** + * If the editor is asking for signature help because a certain character was typed + * (as opposed to when the user explicitly requested them) this should be set. + */ + triggerCharacter?: SignatureHelpTriggerCharacter; + } + export interface ApplyCodeActionCommandResult { successMessage: string; } diff --git a/src/testRunner/unittests/cancellableLanguageServiceOperations.ts b/src/testRunner/unittests/cancellableLanguageServiceOperations.ts index a5947cc17e3dd..37f829d67a7b9 100644 --- a/src/testRunner/unittests/cancellableLanguageServiceOperations.ts +++ b/src/testRunner/unittests/cancellableLanguageServiceOperations.ts @@ -8,7 +8,7 @@ namespace ts { `; it("can cancel signature help mid-request", () => { verifyOperationCancelledAfter(file, 4, service => // Two calls are top-level in services, one is the root type, and the second should be for the parameter type - service.getSignatureHelpItems("file.ts", file.lastIndexOf("f"))!, + service.getSignatureHelpItems("file.ts", file.lastIndexOf("f"), emptyOptions)!, r => assert.exists(r.items[0]) ); }); diff --git a/src/testRunner/unittests/extractTestHelpers.ts b/src/testRunner/unittests/extractTestHelpers.ts index c36ac88e8e0ac..d812eb96f88b9 100644 --- a/src/testRunner/unittests/extractTestHelpers.ts +++ b/src/testRunner/unittests/extractTestHelpers.ts @@ -124,7 +124,7 @@ namespace ts { endPosition: selectionRange.end, host: notImplementedHost, formatContext: formatting.getFormatContext(testFormatOptions), - preferences: defaultPreferences, + preferences: emptyOptions, }; const rangeToExtract = refactor.extractSymbol.getRangeToExtract(sourceFile, createTextSpanFromRange(selectionRange)); assert.equal(rangeToExtract.errors, undefined, rangeToExtract.errors && "Range error: " + rangeToExtract.errors[0].messageText); @@ -188,7 +188,7 @@ namespace ts { endPosition: selectionRange.end, host: notImplementedHost, formatContext: formatting.getFormatContext(testFormatOptions), - preferences: defaultPreferences, + preferences: emptyOptions, }; const rangeToExtract = refactor.extractSymbol.getRangeToExtract(sourceFile, createTextSpanFromRange(selectionRange)); assert.isUndefined(rangeToExtract.errors, rangeToExtract.errors && "Range error: " + rangeToExtract.errors[0].messageText); diff --git a/src/testRunner/unittests/organizeImports.ts b/src/testRunner/unittests/organizeImports.ts index b889f97ef1c6d..7fe99ffc784ee 100644 --- a/src/testRunner/unittests/organizeImports.ts +++ b/src/testRunner/unittests/organizeImports.ts @@ -270,7 +270,7 @@ export const Other = 1; content: "function F() { }", }; const languageService = makeLanguageService(testFile); - const changes = languageService.organizeImports({ type: "file", fileName: testFile.path }, testFormatOptions, defaultPreferences); + const changes = languageService.organizeImports({ type: "file", fileName: testFile.path }, testFormatOptions, emptyOptions); assert.isEmpty(changes); }); @@ -741,7 +741,7 @@ export * from "lib"; function runBaseline(baselinePath: string, testFile: TestFSWithWatch.File, ...otherFiles: TestFSWithWatch.File[]) { const { path: testPath, content: testContent } = testFile; const languageService = makeLanguageService(testFile, ...otherFiles); - const changes = languageService.organizeImports({ type: "file", fileName: testPath }, testFormatOptions, defaultPreferences); + const changes = languageService.organizeImports({ type: "file", fileName: testPath }, testFormatOptions, emptyOptions); assert.equal(changes.length, 1); assert.equal(changes[0].fileName, testPath); diff --git a/src/testRunner/unittests/tsserverProjectSystem.ts b/src/testRunner/unittests/tsserverProjectSystem.ts index 04720fe42aff7..eea8530d516b5 100644 --- a/src/testRunner/unittests/tsserverProjectSystem.ts +++ b/src/testRunner/unittests/tsserverProjectSystem.ts @@ -1497,13 +1497,13 @@ namespace ts.projectSystem { service.checkNumberOfProjects({ externalProjects: 1 }); checkProjectActualFiles(service.externalProjects[0], [f1.path, f2.path, libFile.path]); - const completions1 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 2, defaultPreferences)!; + const completions1 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 2, emptyOptions)!; // should contain completions for string assert.isTrue(completions1.entries.some(e => e.name === "charAt"), "should contain 'charAt'"); assert.isFalse(completions1.entries.some(e => e.name === "toExponential"), "should not contain 'toExponential'"); service.closeClientFile(f2.path); - const completions2 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 2, defaultPreferences)!; + const completions2 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 2, emptyOptions)!; // should contain completions for string assert.isFalse(completions2.entries.some(e => e.name === "charAt"), "should not contain 'charAt'"); assert.isTrue(completions2.entries.some(e => e.name === "toExponential"), "should contain 'toExponential'"); @@ -1529,11 +1529,11 @@ namespace ts.projectSystem { service.checkNumberOfProjects({ externalProjects: 1 }); checkProjectActualFiles(service.externalProjects[0], [f1.path, f2.path, libFile.path]); - const completions1 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 0, defaultPreferences)!; + const completions1 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 0, emptyOptions)!; assert.isTrue(completions1.entries.some(e => e.name === "somelongname"), "should contain 'somelongname'"); service.closeClientFile(f2.path); - const completions2 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 0, defaultPreferences)!; + const completions2 = service.externalProjects[0].getLanguageService().getCompletionsAtPosition(f1.path, 0, emptyOptions)!; assert.isFalse(completions2.entries.some(e => e.name === "somelongname"), "should not contain 'somelongname'"); const sf2 = service.externalProjects[0].getLanguageService().getProgram()!.getSourceFile(f2.path)!; assert.equal(sf2.text, ""); @@ -2173,7 +2173,7 @@ namespace ts.projectSystem { // Check identifiers defined in HTML content are available in .ts file const project = configuredProjectAt(projectService, 0); - let completions = project.getLanguageService().getCompletionsAtPosition(file1.path, 1, defaultPreferences); + let completions = project.getLanguageService().getCompletionsAtPosition(file1.path, 1, emptyOptions); assert(completions && completions.entries[0].name === "hello", `expected entry hello to be in completion list`); // Close HTML file @@ -2187,7 +2187,7 @@ namespace ts.projectSystem { checkProjectActualFiles(configuredProjectAt(projectService, 0), [file1.path, file2.path, config.path]); // Check identifiers defined in HTML content are not available in .ts file - completions = project.getLanguageService().getCompletionsAtPosition(file1.path, 5, defaultPreferences); + completions = project.getLanguageService().getCompletionsAtPosition(file1.path, 5, emptyOptions); assert(completions && completions.entries[0].name !== "hello", `unexpected hello entry in completion list`); }); @@ -8613,7 +8613,7 @@ new C();` Debug.assert(!!project.resolveModuleNames); - const edits = project.getLanguageService().getEditsForFileRename("/old.ts", "/new.ts", testFormatOptions, defaultPreferences); + const edits = project.getLanguageService().getEditsForFileRename("/old.ts", "/new.ts", testFormatOptions, emptyOptions); assert.deepEqual>(edits, [{ fileName: "/user.ts", textChanges: [{ diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index a104e2fde0fdc..e287e323fe781 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -262,7 +262,8 @@ declare namespace FourSlashInterface { rangesAreRenameLocations(options?: Range[] | { findInStrings?: boolean, findInComments?: boolean, ranges?: Range[] }); findReferencesDefinitionDisplayPartsAtCaretAre(expected: ts.SymbolDisplayPart[]): void; noSignatureHelp(...markers: string[]): void; - signatureHelp(...options: VerifySignatureHelpOptions[]): void; + noSignatureHelpForTriggerCharacter(triggerCharacter: string, ...markers: string[]): void + signatureHelp(...options: VerifySignatureHelpOptions[], ): void; // Checks that there are no compile errors. noErrors(): void; numberOfErrorsInCurrentFile(expected: number): void; @@ -560,6 +561,7 @@ declare namespace FourSlashInterface { argumentCount?: number; isVariadic?: boolean; tags?: ReadonlyArray; + triggerCharacter?: string; } interface JSDocTagInfo { diff --git a/tests/cases/fourslash/signatureHelpFilteredTriggerCharacters01.ts b/tests/cases/fourslash/signatureHelpFilteredTriggerCharacters01.ts new file mode 100644 index 0000000000000..2ff5d1c0c401a --- /dev/null +++ b/tests/cases/fourslash/signatureHelpFilteredTriggerCharacters01.ts @@ -0,0 +1,15 @@ +/// + +////function foo(x: T): T { +//// throw null; +////} +//// +////foo("/**/") + +goTo.marker(); +for (const triggerCharacter of ["<", "(", ","]) { + edit.insert(triggerCharacter); + verify.noSignatureHelpForTriggerCharacter(triggerCharacter); + edit.backspace(); +} +verify.signatureHelp({ triggerCharacter: undefined }); \ No newline at end of file From 5b8aad046f4555e4bf48fdb6fa443013a52d0206 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Tue, 12 Jun 2018 15:42:01 -0700 Subject: [PATCH 2/5] Accepted baselines. --- .../reference/APISample_Watch.errors.txt | 180 +++++++++--------- .../APISample_WatchWithDefaults.errors.txt | 180 +++++++++--------- ...APISample_WatchWithOwnWatchHost.errors.txt | 180 +++++++++--------- .../reference/APISample_compile.errors.txt | 180 +++++++++--------- .../reference/APISample_jsdoc.errors.txt | 180 +++++++++--------- .../reference/APISample_linter.errors.txt | 180 +++++++++--------- .../APISample_parseConfig.errors.txt | 180 +++++++++--------- .../reference/APISample_transform.errors.txt | 180 +++++++++--------- .../reference/APISample_watcher.errors.txt | 180 +++++++++--------- .../reference/api/tsserverlibrary.d.ts | 28 ++- tests/baselines/reference/api/typescript.d.ts | 26 ++- 11 files changed, 846 insertions(+), 828 deletions(-) diff --git a/tests/baselines/reference/APISample_Watch.errors.txt b/tests/baselines/reference/APISample_Watch.errors.txt index e1e24d9d1a8ed..bfdd3b5e3b4aa 100644 --- a/tests/baselines/reference/APISample_Watch.errors.txt +++ b/tests/baselines/reference/APISample_Watch.errors.txt @@ -1,83 +1,75 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,40): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,40): error TS1005: ';' expected. typescript_standalone.d.ts(11243,28): error TS1005: ';' expected. typescript_standalone.d.ts(11243,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,41): error TS1005: ';' expected. typescript_standalone.d.ts(11515,28): error TS1005: ';' expected. typescript_standalone.d.ts(11515,37): error TS1005: ';' expected. typescript_standalone.d.ts(11517,28): error TS1005: ';' expected. typescript_standalone.d.ts(11517,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,37): error TS1005: ';' expected. typescript_standalone.d.ts(11521,28): error TS1005: ';' expected. typescript_standalone.d.ts(11521,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11538,28): error TS1005: ';' expected. typescript_standalone.d.ts(11538,37): error TS1005: ';' expected. typescript_standalone.d.ts(11540,28): error TS1005: ';' expected. @@ -100,14 +92,14 @@ typescript_standalone.d.ts(11556,28): error TS1005: ';' expected. typescript_standalone.d.ts(11556,37): error TS1005: ';' expected. typescript_standalone.d.ts(11558,28): error TS1005: ';' expected. typescript_standalone.d.ts(11558,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,37): error TS1005: ';' expected. typescript_standalone.d.ts(11576,28): error TS1005: ';' expected. typescript_standalone.d.ts(11576,37): error TS1005: ';' expected. typescript_standalone.d.ts(11578,28): error TS1005: ';' expected. @@ -115,19 +107,27 @@ typescript_standalone.d.ts(11578,37): error TS1005: ';' expected. typescript_standalone.d.ts(11580,28): error TS1005: ';' expected. typescript_standalone.d.ts(11580,37): error TS1005: ';' expected. typescript_standalone.d.ts(11582,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11582,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11582,37): error TS1005: ';' expected. typescript_standalone.d.ts(11584,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11584,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,72): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,38): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,71): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11584,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_Watch.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_WatchWithDefaults.errors.txt b/tests/baselines/reference/APISample_WatchWithDefaults.errors.txt index a67ce67f33426..3f40009d71f46 100644 --- a/tests/baselines/reference/APISample_WatchWithDefaults.errors.txt +++ b/tests/baselines/reference/APISample_WatchWithDefaults.errors.txt @@ -1,83 +1,75 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,40): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,40): error TS1005: ';' expected. typescript_standalone.d.ts(11243,28): error TS1005: ';' expected. typescript_standalone.d.ts(11243,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,41): error TS1005: ';' expected. typescript_standalone.d.ts(11515,28): error TS1005: ';' expected. typescript_standalone.d.ts(11515,37): error TS1005: ';' expected. typescript_standalone.d.ts(11517,28): error TS1005: ';' expected. typescript_standalone.d.ts(11517,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,37): error TS1005: ';' expected. typescript_standalone.d.ts(11521,28): error TS1005: ';' expected. typescript_standalone.d.ts(11521,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11538,28): error TS1005: ';' expected. typescript_standalone.d.ts(11538,37): error TS1005: ';' expected. typescript_standalone.d.ts(11540,28): error TS1005: ';' expected. @@ -100,14 +92,14 @@ typescript_standalone.d.ts(11556,28): error TS1005: ';' expected. typescript_standalone.d.ts(11556,37): error TS1005: ';' expected. typescript_standalone.d.ts(11558,28): error TS1005: ';' expected. typescript_standalone.d.ts(11558,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,37): error TS1005: ';' expected. typescript_standalone.d.ts(11576,28): error TS1005: ';' expected. typescript_standalone.d.ts(11576,37): error TS1005: ';' expected. typescript_standalone.d.ts(11578,28): error TS1005: ';' expected. @@ -115,19 +107,27 @@ typescript_standalone.d.ts(11578,37): error TS1005: ';' expected. typescript_standalone.d.ts(11580,28): error TS1005: ';' expected. typescript_standalone.d.ts(11580,37): error TS1005: ';' expected. typescript_standalone.d.ts(11582,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11582,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11582,37): error TS1005: ';' expected. typescript_standalone.d.ts(11584,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11584,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,72): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,38): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,71): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11584,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_WatchWithDefaults.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt b/tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt index ab00aef04d8ca..4b2e017c774f7 100644 --- a/tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt +++ b/tests/baselines/reference/APISample_WatchWithOwnWatchHost.errors.txt @@ -1,83 +1,75 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,40): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,40): error TS1005: ';' expected. typescript_standalone.d.ts(11243,28): error TS1005: ';' expected. typescript_standalone.d.ts(11243,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,41): error TS1005: ';' expected. typescript_standalone.d.ts(11515,28): error TS1005: ';' expected. typescript_standalone.d.ts(11515,37): error TS1005: ';' expected. typescript_standalone.d.ts(11517,28): error TS1005: ';' expected. typescript_standalone.d.ts(11517,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,37): error TS1005: ';' expected. typescript_standalone.d.ts(11521,28): error TS1005: ';' expected. typescript_standalone.d.ts(11521,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11538,28): error TS1005: ';' expected. typescript_standalone.d.ts(11538,37): error TS1005: ';' expected. typescript_standalone.d.ts(11540,28): error TS1005: ';' expected. @@ -100,14 +92,14 @@ typescript_standalone.d.ts(11556,28): error TS1005: ';' expected. typescript_standalone.d.ts(11556,37): error TS1005: ';' expected. typescript_standalone.d.ts(11558,28): error TS1005: ';' expected. typescript_standalone.d.ts(11558,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,37): error TS1005: ';' expected. typescript_standalone.d.ts(11576,28): error TS1005: ';' expected. typescript_standalone.d.ts(11576,37): error TS1005: ';' expected. typescript_standalone.d.ts(11578,28): error TS1005: ';' expected. @@ -115,19 +107,27 @@ typescript_standalone.d.ts(11578,37): error TS1005: ';' expected. typescript_standalone.d.ts(11580,28): error TS1005: ';' expected. typescript_standalone.d.ts(11580,37): error TS1005: ';' expected. typescript_standalone.d.ts(11582,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11582,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11582,37): error TS1005: ';' expected. typescript_standalone.d.ts(11584,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11584,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,72): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,38): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,71): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11584,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_WatchWithOwnWatchHost.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_compile.errors.txt b/tests/baselines/reference/APISample_compile.errors.txt index 6aef2e513edc2..efd2eef65c75f 100644 --- a/tests/baselines/reference/APISample_compile.errors.txt +++ b/tests/baselines/reference/APISample_compile.errors.txt @@ -1,83 +1,75 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,40): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,40): error TS1005: ';' expected. typescript_standalone.d.ts(11243,28): error TS1005: ';' expected. typescript_standalone.d.ts(11243,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,41): error TS1005: ';' expected. typescript_standalone.d.ts(11515,28): error TS1005: ';' expected. typescript_standalone.d.ts(11515,37): error TS1005: ';' expected. typescript_standalone.d.ts(11517,28): error TS1005: ';' expected. typescript_standalone.d.ts(11517,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,37): error TS1005: ';' expected. typescript_standalone.d.ts(11521,28): error TS1005: ';' expected. typescript_standalone.d.ts(11521,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11538,28): error TS1005: ';' expected. typescript_standalone.d.ts(11538,37): error TS1005: ';' expected. typescript_standalone.d.ts(11540,28): error TS1005: ';' expected. @@ -100,14 +92,14 @@ typescript_standalone.d.ts(11556,28): error TS1005: ';' expected. typescript_standalone.d.ts(11556,37): error TS1005: ';' expected. typescript_standalone.d.ts(11558,28): error TS1005: ';' expected. typescript_standalone.d.ts(11558,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,37): error TS1005: ';' expected. typescript_standalone.d.ts(11576,28): error TS1005: ';' expected. typescript_standalone.d.ts(11576,37): error TS1005: ';' expected. typescript_standalone.d.ts(11578,28): error TS1005: ';' expected. @@ -115,19 +107,27 @@ typescript_standalone.d.ts(11578,37): error TS1005: ';' expected. typescript_standalone.d.ts(11580,28): error TS1005: ';' expected. typescript_standalone.d.ts(11580,37): error TS1005: ';' expected. typescript_standalone.d.ts(11582,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11582,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11582,37): error TS1005: ';' expected. typescript_standalone.d.ts(11584,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11584,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,72): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,38): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,71): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11584,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_compile.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_jsdoc.errors.txt b/tests/baselines/reference/APISample_jsdoc.errors.txt index cb323e7d542a8..b3f002426b4af 100644 --- a/tests/baselines/reference/APISample_jsdoc.errors.txt +++ b/tests/baselines/reference/APISample_jsdoc.errors.txt @@ -1,83 +1,75 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,40): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,40): error TS1005: ';' expected. typescript_standalone.d.ts(11243,28): error TS1005: ';' expected. typescript_standalone.d.ts(11243,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,41): error TS1005: ';' expected. typescript_standalone.d.ts(11515,28): error TS1005: ';' expected. typescript_standalone.d.ts(11515,37): error TS1005: ';' expected. typescript_standalone.d.ts(11517,28): error TS1005: ';' expected. typescript_standalone.d.ts(11517,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,37): error TS1005: ';' expected. typescript_standalone.d.ts(11521,28): error TS1005: ';' expected. typescript_standalone.d.ts(11521,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11538,28): error TS1005: ';' expected. typescript_standalone.d.ts(11538,37): error TS1005: ';' expected. typescript_standalone.d.ts(11540,28): error TS1005: ';' expected. @@ -100,14 +92,14 @@ typescript_standalone.d.ts(11556,28): error TS1005: ';' expected. typescript_standalone.d.ts(11556,37): error TS1005: ';' expected. typescript_standalone.d.ts(11558,28): error TS1005: ';' expected. typescript_standalone.d.ts(11558,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,37): error TS1005: ';' expected. typescript_standalone.d.ts(11576,28): error TS1005: ';' expected. typescript_standalone.d.ts(11576,37): error TS1005: ';' expected. typescript_standalone.d.ts(11578,28): error TS1005: ';' expected. @@ -115,19 +107,27 @@ typescript_standalone.d.ts(11578,37): error TS1005: ';' expected. typescript_standalone.d.ts(11580,28): error TS1005: ';' expected. typescript_standalone.d.ts(11580,37): error TS1005: ';' expected. typescript_standalone.d.ts(11582,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11582,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11582,37): error TS1005: ';' expected. typescript_standalone.d.ts(11584,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11584,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,72): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,38): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,71): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11584,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_jsdoc.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_linter.errors.txt b/tests/baselines/reference/APISample_linter.errors.txt index 3f3c3d92c35fe..d5d69e48e5cc4 100644 --- a/tests/baselines/reference/APISample_linter.errors.txt +++ b/tests/baselines/reference/APISample_linter.errors.txt @@ -1,83 +1,75 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,40): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,40): error TS1005: ';' expected. typescript_standalone.d.ts(11243,28): error TS1005: ';' expected. typescript_standalone.d.ts(11243,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,41): error TS1005: ';' expected. typescript_standalone.d.ts(11515,28): error TS1005: ';' expected. typescript_standalone.d.ts(11515,37): error TS1005: ';' expected. typescript_standalone.d.ts(11517,28): error TS1005: ';' expected. typescript_standalone.d.ts(11517,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,37): error TS1005: ';' expected. typescript_standalone.d.ts(11521,28): error TS1005: ';' expected. typescript_standalone.d.ts(11521,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11538,28): error TS1005: ';' expected. typescript_standalone.d.ts(11538,37): error TS1005: ';' expected. typescript_standalone.d.ts(11540,28): error TS1005: ';' expected. @@ -100,14 +92,14 @@ typescript_standalone.d.ts(11556,28): error TS1005: ';' expected. typescript_standalone.d.ts(11556,37): error TS1005: ';' expected. typescript_standalone.d.ts(11558,28): error TS1005: ';' expected. typescript_standalone.d.ts(11558,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,37): error TS1005: ';' expected. typescript_standalone.d.ts(11576,28): error TS1005: ';' expected. typescript_standalone.d.ts(11576,37): error TS1005: ';' expected. typescript_standalone.d.ts(11578,28): error TS1005: ';' expected. @@ -115,19 +107,27 @@ typescript_standalone.d.ts(11578,37): error TS1005: ';' expected. typescript_standalone.d.ts(11580,28): error TS1005: ';' expected. typescript_standalone.d.ts(11580,37): error TS1005: ';' expected. typescript_standalone.d.ts(11582,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11582,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11582,37): error TS1005: ';' expected. typescript_standalone.d.ts(11584,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11584,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,72): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,38): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,71): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11584,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_linter.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_parseConfig.errors.txt b/tests/baselines/reference/APISample_parseConfig.errors.txt index 31b18c908b32b..62a083fcb0cc1 100644 --- a/tests/baselines/reference/APISample_parseConfig.errors.txt +++ b/tests/baselines/reference/APISample_parseConfig.errors.txt @@ -1,83 +1,75 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,40): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,40): error TS1005: ';' expected. typescript_standalone.d.ts(11243,28): error TS1005: ';' expected. typescript_standalone.d.ts(11243,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,41): error TS1005: ';' expected. typescript_standalone.d.ts(11515,28): error TS1005: ';' expected. typescript_standalone.d.ts(11515,37): error TS1005: ';' expected. typescript_standalone.d.ts(11517,28): error TS1005: ';' expected. typescript_standalone.d.ts(11517,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,37): error TS1005: ';' expected. typescript_standalone.d.ts(11521,28): error TS1005: ';' expected. typescript_standalone.d.ts(11521,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11538,28): error TS1005: ';' expected. typescript_standalone.d.ts(11538,37): error TS1005: ';' expected. typescript_standalone.d.ts(11540,28): error TS1005: ';' expected. @@ -100,14 +92,14 @@ typescript_standalone.d.ts(11556,28): error TS1005: ';' expected. typescript_standalone.d.ts(11556,37): error TS1005: ';' expected. typescript_standalone.d.ts(11558,28): error TS1005: ';' expected. typescript_standalone.d.ts(11558,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,37): error TS1005: ';' expected. typescript_standalone.d.ts(11576,28): error TS1005: ';' expected. typescript_standalone.d.ts(11576,37): error TS1005: ';' expected. typescript_standalone.d.ts(11578,28): error TS1005: ';' expected. @@ -115,19 +107,27 @@ typescript_standalone.d.ts(11578,37): error TS1005: ';' expected. typescript_standalone.d.ts(11580,28): error TS1005: ';' expected. typescript_standalone.d.ts(11580,37): error TS1005: ';' expected. typescript_standalone.d.ts(11582,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11582,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11582,37): error TS1005: ';' expected. typescript_standalone.d.ts(11584,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11584,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,72): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,38): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,71): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11584,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_parseConfig.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_transform.errors.txt b/tests/baselines/reference/APISample_transform.errors.txt index a60d4983246aa..996683b6785f8 100644 --- a/tests/baselines/reference/APISample_transform.errors.txt +++ b/tests/baselines/reference/APISample_transform.errors.txt @@ -1,83 +1,75 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,40): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,40): error TS1005: ';' expected. typescript_standalone.d.ts(11243,28): error TS1005: ';' expected. typescript_standalone.d.ts(11243,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,41): error TS1005: ';' expected. typescript_standalone.d.ts(11515,28): error TS1005: ';' expected. typescript_standalone.d.ts(11515,37): error TS1005: ';' expected. typescript_standalone.d.ts(11517,28): error TS1005: ';' expected. typescript_standalone.d.ts(11517,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,37): error TS1005: ';' expected. typescript_standalone.d.ts(11521,28): error TS1005: ';' expected. typescript_standalone.d.ts(11521,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11538,28): error TS1005: ';' expected. typescript_standalone.d.ts(11538,37): error TS1005: ';' expected. typescript_standalone.d.ts(11540,28): error TS1005: ';' expected. @@ -100,14 +92,14 @@ typescript_standalone.d.ts(11556,28): error TS1005: ';' expected. typescript_standalone.d.ts(11556,37): error TS1005: ';' expected. typescript_standalone.d.ts(11558,28): error TS1005: ';' expected. typescript_standalone.d.ts(11558,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,37): error TS1005: ';' expected. typescript_standalone.d.ts(11576,28): error TS1005: ';' expected. typescript_standalone.d.ts(11576,37): error TS1005: ';' expected. typescript_standalone.d.ts(11578,28): error TS1005: ';' expected. @@ -115,19 +107,27 @@ typescript_standalone.d.ts(11578,37): error TS1005: ';' expected. typescript_standalone.d.ts(11580,28): error TS1005: ';' expected. typescript_standalone.d.ts(11580,37): error TS1005: ';' expected. typescript_standalone.d.ts(11582,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11582,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11582,37): error TS1005: ';' expected. typescript_standalone.d.ts(11584,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11584,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,72): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,38): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,71): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11584,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_transform.ts (0 errors) ==== diff --git a/tests/baselines/reference/APISample_watcher.errors.txt b/tests/baselines/reference/APISample_watcher.errors.txt index dc4736619ca28..acb4d0b023361 100644 --- a/tests/baselines/reference/APISample_watcher.errors.txt +++ b/tests/baselines/reference/APISample_watcher.errors.txt @@ -1,83 +1,75 @@ typescript_standalone.d.ts(21,28): error TS1005: ';' expected. typescript_standalone.d.ts(21,41): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,28): error TS1005: ';' expected. -typescript_standalone.d.ts(8913,42): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9173,46): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9523,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9547,36): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,28): error TS1005: ';' expected. -typescript_standalone.d.ts(9634,38): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10799,57): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10810,41): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10820,48): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10895,47): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,28): error TS1005: ';' expected. -typescript_standalone.d.ts(10952,47): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11006,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11026,44): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11036,35): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11070,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11073,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11077,45): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11095,56): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11121,36): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11124,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11136,43): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11166,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11200,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11211,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11235,40): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,28): error TS1005: ';' expected. +typescript_standalone.d.ts(8910,42): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9170,46): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9520,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9544,36): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,28): error TS1005: ';' expected. +typescript_standalone.d.ts(9631,38): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10807,57): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10818,41): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10828,48): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10903,47): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,28): error TS1005: ';' expected. +typescript_standalone.d.ts(10960,47): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11014,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11034,44): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11044,35): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11078,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11081,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11085,45): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11103,56): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11129,36): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11132,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11144,43): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11174,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11208,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11219,40): error TS1005: ';' expected. typescript_standalone.d.ts(11243,28): error TS1005: ';' expected. typescript_standalone.d.ts(11243,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11247,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11277,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11320,41): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11507,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11509,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11513,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11251,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11255,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11285,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11328,41): error TS1005: ';' expected. typescript_standalone.d.ts(11515,28): error TS1005: ';' expected. typescript_standalone.d.ts(11515,37): error TS1005: ';' expected. typescript_standalone.d.ts(11517,28): error TS1005: ';' expected. typescript_standalone.d.ts(11517,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11519,37): error TS1005: ';' expected. typescript_standalone.d.ts(11521,28): error TS1005: ';' expected. typescript_standalone.d.ts(11521,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11530,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11532,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11534,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11536,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11523,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11525,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11527,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11529,37): error TS1005: ';' expected. typescript_standalone.d.ts(11538,28): error TS1005: ';' expected. typescript_standalone.d.ts(11538,37): error TS1005: ';' expected. typescript_standalone.d.ts(11540,28): error TS1005: ';' expected. @@ -100,14 +92,14 @@ typescript_standalone.d.ts(11556,28): error TS1005: ';' expected. typescript_standalone.d.ts(11556,37): error TS1005: ';' expected. typescript_standalone.d.ts(11558,28): error TS1005: ';' expected. typescript_standalone.d.ts(11558,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11568,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11570,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11572,37): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11574,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11560,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11562,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11564,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11566,37): error TS1005: ';' expected. typescript_standalone.d.ts(11576,28): error TS1005: ';' expected. typescript_standalone.d.ts(11576,37): error TS1005: ';' expected. typescript_standalone.d.ts(11578,28): error TS1005: ';' expected. @@ -115,19 +107,27 @@ typescript_standalone.d.ts(11578,37): error TS1005: ';' expected. typescript_standalone.d.ts(11580,28): error TS1005: ';' expected. typescript_standalone.d.ts(11580,37): error TS1005: ';' expected. typescript_standalone.d.ts(11582,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11582,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11582,37): error TS1005: ';' expected. typescript_standalone.d.ts(11584,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11584,52): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11656,72): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11658,38): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11660,71): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11662,40): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,28): error TS1005: ';' expected. -typescript_standalone.d.ts(11738,48): error TS1005: ';' expected. +typescript_standalone.d.ts(11584,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11586,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11588,37): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11590,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11592,52): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11664,72): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11666,38): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11668,71): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11670,40): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,28): error TS1005: ';' expected. +typescript_standalone.d.ts(11746,48): error TS1005: ';' expected. ==== tests/cases/compiler/APISample_watcher.ts (0 errors) ==== diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index c09fab01201bc..a79a96bc8a86a 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -4467,7 +4467,6 @@ declare namespace ts { useCaseSensitiveFileNames?(): boolean; fileExists?(path: string): boolean; readFile?(path: string): string | undefined; - getSourceFiles?(): ReadonlyArray; } /** @deprecated See comment on SymbolWriter */ interface SymbolTracker { @@ -6223,8 +6222,6 @@ declare namespace ts { function getDeclarationOfJSInitializer(node: Node): Node | undefined; /** Get the initializer, taking into account defaulted Javascript initializers */ function getEffectiveInitializer(node: HasExpressionInitializer): Expression | undefined; - /** Get the declaration initializer when it is container-like (See getJavascriptInitializer). */ - function getDeclaredJavascriptInitializer(node: HasExpressionInitializer): Expression | undefined; /** * Get the assignment 'initializer' -- the righthand side-- when the initializer is container-like (See getJavascriptInitializer). * We treat the right hand side of assignments with container-like initalizers as declarations. @@ -9175,7 +9172,7 @@ declare namespace ts.moduleSpecifiers { importModuleSpecifierPreference?: "relative" | "non-relative"; } function getModuleSpecifier(compilerOptions: CompilerOptions, fromSourceFile: SourceFile, fromSourceFileName: string, toFileName: string, host: ModuleSpecifierResolutionHost, preferences?: ModuleSpecifierPreferences): string; - function getModuleSpecifiers(moduleSymbol: Symbol, compilerOptions: CompilerOptions, importingSourceFile: SourceFile, host: ModuleSpecifierResolutionHost, files: ReadonlyArray, preferences: ModuleSpecifierPreferences): ReadonlyArray>; + function getModuleSpecifiers(moduleSymbol: Symbol, program: Program, importingSourceFile: SourceFile, host: ModuleSpecifierResolutionHost, preferences: ModuleSpecifierPreferences): ReadonlyArray>; } declare namespace ts { /** @@ -9685,7 +9682,7 @@ declare namespace ts { readonly importModuleSpecifierPreference?: "relative" | "non-relative"; readonly allowTextChangesInNewFiles?: boolean; } - const defaultPreferences: UserPreferences; + const emptyOptions: {}; interface LanguageService { cleanupSemanticCache(): void; getSyntacticDiagnostics(fileName: string): DiagnosticWithLocation[]; @@ -9709,7 +9706,7 @@ declare namespace ts { getQuickInfoAtPosition(fileName: string, position: number): QuickInfo | undefined; getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan | undefined; getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan | undefined; - getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems | undefined; + getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): SignatureHelpItems | undefined; getRenameInfo(fileName: string, position: number): RenameInfo; findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[] | undefined; getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] | undefined; @@ -9770,13 +9767,24 @@ declare namespace ts { type OrganizeImportsScope = CombinedCodeFixScope; type CompletionsTriggerCharacter = "." | '"' | "'" | "`" | "/" | "@" | "<"; interface GetCompletionsAtPositionOptions extends UserPreferences { - /** If the editor is asking for completions because a certain character was typed, and not because the user explicitly requested them, this should be set. */ + /** + * If the editor is asking for completions because a certain character was typed + * (as opposed to when the user explicitly requested them) this should be set. + */ triggerCharacter?: CompletionsTriggerCharacter; /** @deprecated Use includeCompletionsForModuleExports */ includeExternalModuleExports?: boolean; /** @deprecated Use includeCompletionsWithInsertText */ includeInsertTextCompletions?: boolean; } + type SignatureHelpTriggerCharacter = "," | "(" | "<"; + interface SignatureHelpItemsOptions { + /** + * If the editor is asking for signature help because a certain character was typed + * (as opposed to when the user explicitly requested them) this should be set. + */ + triggerCharacter?: SignatureHelpTriggerCharacter; + } interface ApplyCodeActionCommandResult { successMessage: string; } @@ -10942,7 +10950,7 @@ declare namespace ts.Rename { function getRenameInfo(typeChecker: TypeChecker, defaultLibFileName: string, getCanonicalFileName: GetCanonicalFileName, sourceFile: SourceFile, position: number): RenameInfo; } declare namespace ts.SignatureHelp { - function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, cancellationToken: CancellationToken): SignatureHelpItems | undefined; + function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, triggerCharacter: SignatureHelpTriggerCharacter | undefined, cancellationToken: CancellationToken): SignatureHelpItems | undefined; interface ArgumentInfoForCompletions { readonly invocation: CallLikeExpression; readonly argumentIndex: number; @@ -11670,7 +11678,7 @@ declare namespace ts { getQuickInfoAtPosition(fileName: string, position: number): string; getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): string; getBreakpointStatementAtPosition(fileName: string, position: number): string; - getSignatureHelpItems(fileName: string, position: number): string; + getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): string; /** * Returns a JSON-encoded value of the type: * { canRename: boolean, localizedErrorMessage: string, displayName: string, fullDisplayName: string, kind: string, kindModifiers: string, triggerSpan: { start; length } } @@ -12874,7 +12882,9 @@ declare namespace ts.server.protocol { argumentIndex: number; argumentCount: number; } + type SignatureHelpTriggerCharacter = "," | "(" | "<"; interface SignatureHelpRequestArgs extends FileLocationRequestArgs { + triggerCharacter?: SignatureHelpTriggerCharacter; } interface SignatureHelpRequest extends FileLocationRequest { command: CommandTypes.SignatureHelp; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 4df566625016d..ef201630e7e1c 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4467,7 +4467,6 @@ declare namespace ts { useCaseSensitiveFileNames?(): boolean; fileExists?(path: string): boolean; readFile?(path: string): string | undefined; - getSourceFiles?(): ReadonlyArray; } /** @deprecated See comment on SymbolWriter */ interface SymbolTracker { @@ -6223,8 +6222,6 @@ declare namespace ts { function getDeclarationOfJSInitializer(node: Node): Node | undefined; /** Get the initializer, taking into account defaulted Javascript initializers */ function getEffectiveInitializer(node: HasExpressionInitializer): Expression | undefined; - /** Get the declaration initializer when it is container-like (See getJavascriptInitializer). */ - function getDeclaredJavascriptInitializer(node: HasExpressionInitializer): Expression | undefined; /** * Get the assignment 'initializer' -- the righthand side-- when the initializer is container-like (See getJavascriptInitializer). * We treat the right hand side of assignments with container-like initalizers as declarations. @@ -9175,7 +9172,7 @@ declare namespace ts.moduleSpecifiers { importModuleSpecifierPreference?: "relative" | "non-relative"; } function getModuleSpecifier(compilerOptions: CompilerOptions, fromSourceFile: SourceFile, fromSourceFileName: string, toFileName: string, host: ModuleSpecifierResolutionHost, preferences?: ModuleSpecifierPreferences): string; - function getModuleSpecifiers(moduleSymbol: Symbol, compilerOptions: CompilerOptions, importingSourceFile: SourceFile, host: ModuleSpecifierResolutionHost, files: ReadonlyArray, preferences: ModuleSpecifierPreferences): ReadonlyArray>; + function getModuleSpecifiers(moduleSymbol: Symbol, program: Program, importingSourceFile: SourceFile, host: ModuleSpecifierResolutionHost, preferences: ModuleSpecifierPreferences): ReadonlyArray>; } declare namespace ts { /** @@ -9865,7 +9862,7 @@ declare namespace ts { readonly importModuleSpecifierPreference?: "relative" | "non-relative"; readonly allowTextChangesInNewFiles?: boolean; } - const defaultPreferences: UserPreferences; + const emptyOptions: {}; interface LanguageService { cleanupSemanticCache(): void; getSyntacticDiagnostics(fileName: string): DiagnosticWithLocation[]; @@ -9889,7 +9886,7 @@ declare namespace ts { getQuickInfoAtPosition(fileName: string, position: number): QuickInfo | undefined; getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan | undefined; getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan | undefined; - getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems | undefined; + getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): SignatureHelpItems | undefined; getRenameInfo(fileName: string, position: number): RenameInfo; findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[] | undefined; getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[] | undefined; @@ -9950,13 +9947,24 @@ declare namespace ts { type OrganizeImportsScope = CombinedCodeFixScope; type CompletionsTriggerCharacter = "." | '"' | "'" | "`" | "/" | "@" | "<"; interface GetCompletionsAtPositionOptions extends UserPreferences { - /** If the editor is asking for completions because a certain character was typed, and not because the user explicitly requested them, this should be set. */ + /** + * If the editor is asking for completions because a certain character was typed + * (as opposed to when the user explicitly requested them) this should be set. + */ triggerCharacter?: CompletionsTriggerCharacter; /** @deprecated Use includeCompletionsForModuleExports */ includeExternalModuleExports?: boolean; /** @deprecated Use includeCompletionsWithInsertText */ includeInsertTextCompletions?: boolean; } + type SignatureHelpTriggerCharacter = "," | "(" | "<"; + interface SignatureHelpItemsOptions { + /** + * If the editor is asking for signature help because a certain character was typed + * (as opposed to when the user explicitly requested them) this should be set. + */ + triggerCharacter?: SignatureHelpTriggerCharacter; + } interface ApplyCodeActionCommandResult { successMessage: string; } @@ -11122,7 +11130,7 @@ declare namespace ts.Rename { function getRenameInfo(typeChecker: TypeChecker, defaultLibFileName: string, getCanonicalFileName: GetCanonicalFileName, sourceFile: SourceFile, position: number): RenameInfo; } declare namespace ts.SignatureHelp { - function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, cancellationToken: CancellationToken): SignatureHelpItems | undefined; + function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, triggerCharacter: SignatureHelpTriggerCharacter | undefined, cancellationToken: CancellationToken): SignatureHelpItems | undefined; interface ArgumentInfoForCompletions { readonly invocation: CallLikeExpression; readonly argumentIndex: number; @@ -11850,7 +11858,7 @@ declare namespace ts { getQuickInfoAtPosition(fileName: string, position: number): string; getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): string; getBreakpointStatementAtPosition(fileName: string, position: number): string; - getSignatureHelpItems(fileName: string, position: number): string; + getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): string; /** * Returns a JSON-encoded value of the type: * { canRename: boolean, localizedErrorMessage: string, displayName: string, fullDisplayName: string, kind: string, kindModifiers: string, triggerSpan: { start; length } } From 9651c4231eab9f98b2d955534fe4814f0c4fbc5a Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 2 Jul 2018 16:04:20 -0700 Subject: [PATCH 3/5] Account for trigger reasons, as implemented by Roslyn. --- src/harness/fourslash.ts | 42 ++++++++++++++------- src/server/protocol.ts | 49 ++++++++++++++++++++++-- src/services/services.ts | 4 +- src/services/signatureHelp.ts | 15 ++++++-- src/services/types.ts | 43 +++++++++++++++++++-- tests/cases/fourslash/fourslash.ts | 60 +++++++++++++++++++++++------- 6 files changed, 173 insertions(+), 40 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 99d6ff44b2195..cb7cccb5470b3 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -1426,17 +1426,22 @@ Actual: ${stringify(fullActual)}`); } } - public verifyNoSignatureHelp(triggerCharacter: ts.SignatureHelpTriggerCharacter | undefined, markers: ReadonlyArray) { + public verifySignatureHelpPresence(expectPresent: boolean, triggerReason: ts.SignatureHelpTriggerReason | undefined, markers: ReadonlyArray) { if (markers.length) { for (const marker of markers) { this.goToMarker(marker); - this.verifyNoSignatureHelp(triggerCharacter, ts.emptyArray); + this.verifySignatureHelpPresence(expectPresent, triggerReason, ts.emptyArray); } return; } - const actual = this.getSignatureHelp({ triggerCharacter }); - if (actual) { - this.raiseError(`Expected no signature help, but got "${stringify(actual)}"`); + const actual = this.getSignatureHelp({ triggerReason }); + if (expectPresent !== !!actual) { + if (actual) { + this.raiseError(`Expected no signature help, but got "${stringify(actual)}"`); + } + else { + this.raiseError("Expected signature help, but none was returned.") + } } } @@ -1455,7 +1460,7 @@ Actual: ${stringify(fullActual)}`); } private verifySignatureHelpWorker(options: FourSlashInterface.VerifySignatureHelpOptions) { - const help = this.getSignatureHelp({ triggerCharacter: options.triggerCharacter })!; + const help = this.getSignatureHelp({ triggerReason: options.triggerReason })!; const selectedItem = help.items[help.selectedItemIndex]; // Argument index may exceed number of parameters const currentParameter = selectedItem.parameters[help.argumentIndex] as ts.SignatureHelpParameter | undefined; @@ -1497,7 +1502,7 @@ Actual: ${stringify(fullActual)}`); const allKeys: ReadonlyArray = [ "marker", - "triggerCharacter", + "triggerReason", "overloadsCount", "docComment", "text", @@ -1769,9 +1774,9 @@ Actual: ${stringify(fullActual)}`); Harness.IO.log(stringify(help.items[help.selectedItemIndex])); } - private getSignatureHelp({ triggerCharacter }: FourSlashInterface.VerifySignatureHelpOptions): ts.SignatureHelpItems | undefined { + private getSignatureHelp({ triggerReason }: FourSlashInterface.VerifySignatureHelpOptions): ts.SignatureHelpItems | undefined { return this.languageService.getSignatureHelpItems(this.activeFile.fileName, this.currentCaretPosition, { - triggerCharacter + triggerReason }); } @@ -1870,7 +1875,12 @@ Actual: ${stringify(fullActual)}`); if (highFidelity) { if (ch === "(" || ch === "," || ch === "<") { /* Signature help*/ - this.languageService.getSignatureHelpItems(this.activeFile.fileName, offset, { triggerCharacter: ch }); + this.languageService.getSignatureHelpItems(this.activeFile.fileName, offset, { + triggerReason: { + kind: "characterTyped", + triggerCharacter: ch + } + }); } else if (prevChar === " " && /A-Za-z_/.test(ch)) { /* Completions */ @@ -4081,11 +4091,15 @@ namespace FourSlashInterface { } public noSignatureHelp(...markers: string[]): void { - this.state.verifyNoSignatureHelp(/*triggerCharacter*/ undefined, markers); + this.state.verifySignatureHelpPresence(/*expectPresent*/ false, /*triggerReason*/ undefined, markers); + } + + public noSignatureHelpForTriggerReason(reason: ts.SignatureHelpTriggerReason, ...markers: string[]): void { + this.state.verifySignatureHelpPresence(/*expectPresent*/ false, reason, markers); } - public noSignatureHelpForTriggerCharacter(triggerCharacter: ts.SignatureHelpTriggerCharacter, ...markers: string[]): void { - this.state.verifyNoSignatureHelp(triggerCharacter, markers); + public signatureHelpPresentForTriggerReason(reason: ts.SignatureHelpTriggerReason, ...markers: string[]): void { + this.state.verifySignatureHelpPresence(/*expectPresent*/ true, reason, markers); } public signatureHelp(...options: VerifySignatureHelpOptions[]): void { @@ -4816,7 +4830,7 @@ namespace FourSlashInterface { readonly isVariadic?: boolean; /** @default ts.emptyArray */ readonly tags?: ReadonlyArray; - readonly triggerCharacter?: ts.SignatureHelpTriggerCharacter; + readonly triggerReason?: ts.SignatureHelpTriggerReason; } export type ArrayOrSingle = T | ReadonlyArray; diff --git a/src/server/protocol.ts b/src/server/protocol.ts index 5b5ba4fa5a6fe..ad70ca4f25866 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -2067,16 +2067,57 @@ namespace ts.server.protocol { } export type SignatureHelpTriggerCharacter = "," | "(" | "<"; + export type SignatureHelpRetriggerCharacter = SignatureHelpTriggerCharacter | ")"; + + /** + * Arguments of a signature help request. + */ + export interface SignatureHelpRequestArgs extends FileLocationRequestArgs { + /** + * Reason why signature help was invoked. + * See each individual possible + */ + triggerReason?: SignatureHelpTriggerReason; + } + + export type SignatureHelpTriggerReason = + | SignatureHelpInvokedReason + | SignatureHelpCharacterTypedReason + | SignatureHelpRetriggeredReason; /** - * Arguments of a signature help request. + * Signals that the user manually requested signature help. + * The language service will unconditionally attempt to provide a result. */ - export interface SignatureHelpRequestArgs extends FileLocationRequestArgs { + export interface SignatureHelpInvokedReason { + kind: "invoked", + triggerCharacter?: undefined, + } + + /** + * Signals that the signature help request came from a user typing a character. + * Depending on the character and the syntactic context, the request may or may not be served a result. + */ + export interface SignatureHelpCharacterTypedReason { + kind: "characterTyped", + /** + * Character that was responsible for triggering signature help. + */ + triggerCharacter: SignatureHelpTriggerCharacter, + } + + /** + * Signals that this signature help request came from typing a character or moving the cursor. + * This should only occur if a signature help session was already active and the editor needs to see if it should adjust. + * The language service will unconditionally attempt to provide a result. + * `triggerCharacter` can be `undefined` for a retrigger caused by a cursor move. + */ + export interface SignatureHelpRetriggeredReason { + kind: "retrigger", /** * Character that was responsible for triggering signature help. - * Should be `undefined` if a user manually requested completion. */ - triggerCharacter?: SignatureHelpTriggerCharacter; + triggerCharacter?: SignatureHelpRetriggerCharacter, } /** diff --git a/src/services/services.ts b/src/services/services.ts index 9278f41b82df9..b690febdb2701 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1756,12 +1756,12 @@ namespace ts { /** * This is a semantic operation. */ - function getSignatureHelpItems(fileName: string, position: number, { triggerCharacter }: SignatureHelpItemsOptions = emptyOptions): SignatureHelpItems | undefined { + function getSignatureHelpItems(fileName: string, position: number, { triggerReason }: SignatureHelpItemsOptions = emptyOptions): SignatureHelpItems | undefined { synchronizeHostData(); const sourceFile = getValidSourceFile(fileName); - return SignatureHelp.getSignatureHelpItems(program, sourceFile, position, triggerCharacter, cancellationToken); + return SignatureHelp.getSignatureHelpItems(program, sourceFile, position, triggerReason, cancellationToken); } /// Syntactic features diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts index a183cdab1b4e8..2884f7a7a0ccc 100644 --- a/src/services/signatureHelp.ts +++ b/src/services/signatureHelp.ts @@ -19,7 +19,7 @@ namespace ts.SignatureHelp { argumentCount: number; } - export function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, triggerCharacter: SignatureHelpTriggerCharacter | undefined, cancellationToken: CancellationToken): SignatureHelpItems | undefined { + export function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, triggerReason: SignatureHelpTriggerReason | undefined, cancellationToken: CancellationToken): SignatureHelpItems | undefined { const typeChecker = program.getTypeChecker(); // Decide whether to show signature help @@ -29,9 +29,11 @@ namespace ts.SignatureHelp { return undefined; } - // In the middle of a string, don't provide signature help unless the user explicitly requested it. - if (triggerCharacter !== undefined && isInString(sourceFile, position, startingToken)) { - return undefined; + if (shouldCarefullyCheckContext(triggerReason)) { + // In the middle of a string, don't provide signature help unless the user explicitly requested it. + if (isInString(sourceFile, position, startingToken)) { + return undefined; + } } const argumentInfo = getContainingArgumentInfo(startingToken, position, sourceFile); @@ -55,6 +57,11 @@ namespace ts.SignatureHelp { return typeChecker.runWithCancellationToken(cancellationToken, typeChecker => createSignatureHelpItems(candidateInfo.candidates, candidateInfo.resolvedSignature, argumentInfo, sourceFile, typeChecker)); } + function shouldCarefullyCheckContext(reason: SignatureHelpTriggerReason | undefined) { + // Only need to be careful if the user typed a character and signature help wasn't showing. + return !!reason && reason.kind === "characterTyped"; + } + function getCandidateInfo(argumentInfo: ArgumentListInfo, checker: TypeChecker): { readonly candidates: ReadonlyArray, readonly resolvedSignature: Signature } | undefined { const { invocation } = argumentInfo; if (invocation.kind === InvocationKind.Call) { diff --git a/src/services/types.ts b/src/services/types.ts index d9a305895db98..e586f486a0b31 100644 --- a/src/services/types.ts +++ b/src/services/types.ts @@ -383,13 +383,50 @@ namespace ts { } export type SignatureHelpTriggerCharacter = "," | "(" | "<"; + export type SignatureHelpRetriggerCharacter = SignatureHelpTriggerCharacter | ")"; export interface SignatureHelpItemsOptions { + triggerReason?: SignatureHelpTriggerReason; + } + + export type SignatureHelpTriggerReason = + | SignatureHelpInvokedReason + | SignatureHelpCharacterTypedReason + | SignatureHelpRetriggeredReason; + + /** + * Signals that the user manually requested signature help. + * The language service will unconditionally attempt to provide a result. + */ + export interface SignatureHelpInvokedReason { + kind: "invoked", + triggerCharacter?: undefined, + } + + /** + * Signals that the signature help request came from a user typing a character. + * Depending on the character and the syntactic context, the request may or may not be served a result. + */ + export interface SignatureHelpCharacterTypedReason { + kind: "characterTyped", /** - * If the editor is asking for signature help because a certain character was typed - * (as opposed to when the user explicitly requested them) this should be set. + * Character that was responsible for triggering signature help. + */ + triggerCharacter: SignatureHelpTriggerCharacter, + } + + /** + * Signals that this signature help request came from typing a character or moving the cursor. + * This should only occur if a signature help session was already active and the editor needs to see if it should adjust. + * The language service will unconditionally attempt to provide a result. + * `triggerCharacter` can be `undefined` for a retrigger caused by a cursor move. + */ + export interface SignatureHelpRetriggeredReason { + kind: "retrigger", + /** + * Character that was responsible for triggering signature help. */ - triggerCharacter?: SignatureHelpTriggerCharacter; + triggerCharacter?: SignatureHelpRetriggerCharacter, } export interface ApplyCodeActionCommandResult { diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index 2cdd88bdb9c31..9c68127d74437 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -139,7 +139,6 @@ declare namespace FourSlashInterface { file(name: string, content?: string, scriptKindName?: string): any; select(startMarker: string, endMarker: string): void; selectRange(range: Range): void; - selectAllInFile(fileName: string): void; } class verifyNegatable { private negative; @@ -179,7 +178,7 @@ declare namespace FourSlashInterface { isInCommentAtPosition(onlyMultiLineDiverges?: boolean): void; codeFix(options: { description: string, - newFileContent?: NewFileContent, + newFileContent?: string | { readonly [fileName: string]: string }, newRangeContent?: string, errorCode?: number, index?: number, @@ -191,7 +190,6 @@ declare namespace FourSlashInterface { applicableRefactorAvailableForRange(): void; refactorAvailable(name: string, actionName?: string): void; - refactorsAvailable(names: ReadonlyArray): void; refactor(options: { name: string; actionName: string; @@ -257,14 +255,15 @@ declare namespace FourSlashInterface { * For each of starts, asserts the ranges that are referenced from there. * This uses the 'findReferences' command instead of 'getReferencesAtPosition', so references are grouped by their definition. */ - referenceGroups(starts: ArrayOrSingle | ArrayOrSingle, parts: Array): void; + referenceGroups(starts: ArrayOrSingle | ArrayOrSingle, parts: Array<{ definition: ReferencesDefinition, ranges: Range[] }>): void; singleReferenceGroup(definition: ReferencesDefinition, ranges?: Range[]): void; rangesAreOccurrences(isWriteAccess?: boolean): void; rangesWithSameTextAreRenameLocations(): void; rangesAreRenameLocations(options?: Range[] | { findInStrings?: boolean, findInComments?: boolean, ranges?: Range[] }); findReferencesDefinitionDisplayPartsAtCaretAre(expected: ts.SymbolDisplayPart[]): void; noSignatureHelp(...markers: string[]): void; - noSignatureHelpForTriggerCharacter(triggerCharacter: string, ...markers: string[]): void + noSignatureHelpForTriggerReason(triggerReason: SignatureHelpTriggerReason, ...markers: string[]): void + signatureHelpPresentForTriggerReason(triggerReason: SignatureHelpTriggerReason, ...markers: string[]): void signatureHelp(...options: VerifySignatureHelpOptions[], ): void; // Checks that there are no compile errors. noErrors(): void; @@ -338,7 +337,7 @@ declare namespace FourSlashInterface { getEditsForFileRename(options: { oldPath: string; newPath: string; - newFileContents: { readonly [fileName: string]: string }; + newFileContents: { [fileName: string]: string }; }): void; moveToNewFile(options: { readonly newFileContents: { readonly [fileName: string]: string }; @@ -359,7 +358,7 @@ declare namespace FourSlashInterface { enableFormatting(): void; disableFormatting(): void; - applyRefactor(options: { refactorName: string, actionName: string, actionDescription: string, newContent: NewFileContent }): void; + applyRefactor(options: { refactorName: string, actionName: string, actionDescription: string, newContent: string }): void; } class debug { printCurrentParameterHelp(): void; @@ -514,10 +513,6 @@ declare namespace FourSlashInterface { text: string; range: Range; } - interface ReferenceGroup { - readonly definition: ReferencesDefinition; - readonly ranges: ReadonlyArray; - } interface Diagnostic { message: string; /** @default `test.ranges()[0]` */ @@ -567,7 +562,47 @@ declare namespace FourSlashInterface { argumentCount?: number; isVariadic?: boolean; tags?: ReadonlyArray; - triggerCharacter?: string; + triggerReason?: SignatureHelpTriggerReason; + } + + export type SignatureHelpTriggerReason = + | SignatureHelpInvokedReason + | SignatureHelpCharacterTypedReason + | SignatureHelpRetriggeredReason; + + /** + * Signals that the user manually requested signature help. + * The language service will unconditionally attempt to provide a result. + */ + export interface SignatureHelpInvokedReason { + kind: "invoked", + triggerCharacter?: undefined, + } + + /** + * Signals that the signature help request came from a user typing a character. + * Depending on the character and the syntactic context, the request may or may not be served a result. + */ + export interface SignatureHelpCharacterTypedReason { + kind: "characterTyped", + /** + * Character that was responsible for triggering signature help. + */ + triggerCharacter: string, + } + + /** + * Signals that this signature help request came from typing a character or moving the cursor. + * This should only occur if a signature help session was already active and the editor needs to see if it should adjust. + * The language service will unconditionally attempt to provide a result. + * `triggerCharacter` can be `undefined` for a retrigger caused by a cursor move. + */ + export interface SignatureHelpRetriggeredReason { + kind: "retrigger", + /** + * Character that was responsible for triggering signature help. + */ + triggerCharacter?: string, } interface JSDocTagInfo { @@ -576,7 +611,6 @@ declare namespace FourSlashInterface { } type ArrayOrSingle = T | ReadonlyArray; - type NewFileContent = string | { readonly [fileName: string]: string }; } declare function verifyOperationIsCancelled(f: any): void; declare var test: FourSlashInterface.test_; From 159b3dcec06ef4064074b8e4787f6585b6dbea42 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 2 Jul 2018 16:05:07 -0700 Subject: [PATCH 4/5] Accepted baselines and updated fourslash test. --- .../reference/api/tsserverlibrary.d.ts | 54 +++++++++++++++++-- tests/baselines/reference/api/typescript.d.ts | 36 +++++++++++-- ...ignatureHelpFilteredTriggerCharacters01.ts | 12 ++++- 3 files changed, 92 insertions(+), 10 deletions(-) diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 370c61d700b24..ee7b37373ca14 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -10055,12 +10055,42 @@ declare namespace ts { includeInsertTextCompletions?: boolean; } type SignatureHelpTriggerCharacter = "," | "(" | "<"; + type SignatureHelpRetriggerCharacter = SignatureHelpTriggerCharacter | ")"; interface SignatureHelpItemsOptions { + triggerReason?: SignatureHelpTriggerReason; + } + type SignatureHelpTriggerReason = SignatureHelpInvokedReason | SignatureHelpCharacterTypedReason | SignatureHelpRetriggeredReason; + /** + * Signals that the user manually requested signature help. + * The language service will unconditionally attempt to provide a result. + */ + interface SignatureHelpInvokedReason { + kind: "invoked"; + triggerCharacter?: undefined; + } + /** + * Signals that the signature help request came from a user typing a character. + * Depending on the character and the syntactic context, the request may or may not be served a result. + */ + interface SignatureHelpCharacterTypedReason { + kind: "characterTyped"; /** - * If the editor is asking for signature help because a certain character was typed - * (as opposed to when the user explicitly requested them) this should be set. + * Character that was responsible for triggering signature help. */ - triggerCharacter?: SignatureHelpTriggerCharacter; + triggerCharacter: SignatureHelpTriggerCharacter; + } + /** + * Signals that this signature help request came from typing a character or moving the cursor. + * This should only occur if a signature help session was already active and the editor needs to see if it should adjust. + * The language service will unconditionally attempt to provide a result. + * `triggerCharacter` can be `undefined` for a retrigger caused by a cursor move. + */ + interface SignatureHelpRetriggeredReason { + kind: "retrigger"; + /** + * Character that was responsible for triggering signature help. + */ + triggerCharacter?: SignatureHelpRetriggerCharacter; } interface ApplyCodeActionCommandResult { successMessage: string; @@ -11242,7 +11272,7 @@ declare namespace ts.Rename { function getRenameInfo(program: Program, sourceFile: SourceFile, position: number): RenameInfo; } declare namespace ts.SignatureHelp { - function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, triggerCharacter: SignatureHelpTriggerCharacter | undefined, cancellationToken: CancellationToken): SignatureHelpItems | undefined; + function getSignatureHelpItems(program: Program, sourceFile: SourceFile, position: number, triggerReason: SignatureHelpTriggerReason | undefined, cancellationToken: CancellationToken): SignatureHelpItems | undefined; interface ArgumentInfoForCompletions { readonly invocation: CallLikeExpression; readonly argumentIndex: number; @@ -12973,8 +13003,22 @@ declare namespace ts.server.protocol { argumentCount: number; } type SignatureHelpTriggerCharacter = "," | "(" | "<"; + type SignatureHelpRetriggerCharacter = SignatureHelpTriggerCharacter | ")"; interface SignatureHelpRequestArgs extends FileLocationRequestArgs { - triggerCharacter?: SignatureHelpTriggerCharacter; + triggerReason?: SignatureHelpTriggerReason; + } + type SignatureHelpTriggerReason = SignatureHelpInvokedReason | SignatureHelpCharacterTypedReason | SignatureHelpRetriggeredReason; + interface SignatureHelpInvokedReason { + kind: "invoked"; + triggerCharacter?: undefined; + } + interface SignatureHelpCharacterTypedReason { + kind: "characterTyped"; + triggerCharacter: SignatureHelpTriggerCharacter; + } + interface SignatureHelpRetriggeredReason { + kind: "retrigger"; + triggerCharacter?: SignatureHelpRetriggerCharacter; } interface SignatureHelpRequest extends FileLocationRequest { command: CommandTypes.SignatureHelp; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 5f6b9d91b191d..d129d7839a8c9 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4807,12 +4807,42 @@ declare namespace ts { includeInsertTextCompletions?: boolean; } type SignatureHelpTriggerCharacter = "," | "(" | "<"; + type SignatureHelpRetriggerCharacter = SignatureHelpTriggerCharacter | ")"; interface SignatureHelpItemsOptions { + triggerReason?: SignatureHelpTriggerReason; + } + type SignatureHelpTriggerReason = SignatureHelpInvokedReason | SignatureHelpCharacterTypedReason | SignatureHelpRetriggeredReason; + /** + * Signals that the user manually requested signature help. + * The language service will unconditionally attempt to provide a result. + */ + interface SignatureHelpInvokedReason { + kind: "invoked"; + triggerCharacter?: undefined; + } + /** + * Signals that the signature help request came from a user typing a character. + * Depending on the character and the syntactic context, the request may or may not be served a result. + */ + interface SignatureHelpCharacterTypedReason { + kind: "characterTyped"; /** - * If the editor is asking for signature help because a certain character was typed - * (as opposed to when the user explicitly requested them) this should be set. + * Character that was responsible for triggering signature help. + */ + triggerCharacter: SignatureHelpTriggerCharacter; + } + /** + * Signals that this signature help request came from typing a character or moving the cursor. + * This should only occur if a signature help session was already active and the editor needs to see if it should adjust. + * The language service will unconditionally attempt to provide a result. + * `triggerCharacter` can be `undefined` for a retrigger caused by a cursor move. + */ + interface SignatureHelpRetriggeredReason { + kind: "retrigger"; + /** + * Character that was responsible for triggering signature help. */ - triggerCharacter?: SignatureHelpTriggerCharacter; + triggerCharacter?: SignatureHelpRetriggerCharacter; } interface ApplyCodeActionCommandResult { successMessage: string; diff --git a/tests/cases/fourslash/signatureHelpFilteredTriggerCharacters01.ts b/tests/cases/fourslash/signatureHelpFilteredTriggerCharacters01.ts index 2ff5d1c0c401a..ed97ef020d07e 100644 --- a/tests/cases/fourslash/signatureHelpFilteredTriggerCharacters01.ts +++ b/tests/cases/fourslash/signatureHelpFilteredTriggerCharacters01.ts @@ -9,7 +9,15 @@ goTo.marker(); for (const triggerCharacter of ["<", "(", ","]) { edit.insert(triggerCharacter); - verify.noSignatureHelpForTriggerCharacter(triggerCharacter); + verify.noSignatureHelpForTriggerReason({ + kind: "characterTyped", + triggerCharacter, + }); + verify.signatureHelpPresentForTriggerReason({ + kind: "retrigger", + triggerCharacter, + }); edit.backspace(); } -verify.signatureHelp({ triggerCharacter: undefined }); \ No newline at end of file +verify.signatureHelpPresentForTriggerReason(/*triggerReason*/ undefined); +verify.signatureHelpPresentForTriggerReason({ kind: "invoked" }); \ No newline at end of file From e56a5c1b35efe1828bb5340268554f7280fa19f0 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Mon, 2 Jul 2018 16:40:08 -0700 Subject: [PATCH 5/5] Lints. --- src/harness/fourslash.ts | 2 +- src/server/protocol.ts | 12 ++++++------ src/services/types.ts | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index cb7cccb5470b3..f6196071cafa6 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -1440,7 +1440,7 @@ Actual: ${stringify(fullActual)}`); this.raiseError(`Expected no signature help, but got "${stringify(actual)}"`); } else { - this.raiseError("Expected signature help, but none was returned.") + this.raiseError("Expected signature help, but none was returned."); } } } diff --git a/src/server/protocol.ts b/src/server/protocol.ts index ad70ca4f25866..f4b251f870229 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -2090,8 +2090,8 @@ namespace ts.server.protocol { * The language service will unconditionally attempt to provide a result. */ export interface SignatureHelpInvokedReason { - kind: "invoked", - triggerCharacter?: undefined, + kind: "invoked"; + triggerCharacter?: undefined; } /** @@ -2099,11 +2099,11 @@ namespace ts.server.protocol { * Depending on the character and the syntactic context, the request may or may not be served a result. */ export interface SignatureHelpCharacterTypedReason { - kind: "characterTyped", + kind: "characterTyped"; /** * Character that was responsible for triggering signature help. */ - triggerCharacter: SignatureHelpTriggerCharacter, + triggerCharacter: SignatureHelpTriggerCharacter; } /** @@ -2113,11 +2113,11 @@ namespace ts.server.protocol { * `triggerCharacter` can be `undefined` for a retrigger caused by a cursor move. */ export interface SignatureHelpRetriggeredReason { - kind: "retrigger", + kind: "retrigger"; /** * Character that was responsible for triggering signature help. */ - triggerCharacter?: SignatureHelpRetriggerCharacter, + triggerCharacter?: SignatureHelpRetriggerCharacter; } /** diff --git a/src/services/types.ts b/src/services/types.ts index e586f486a0b31..10b342990b1ff 100644 --- a/src/services/types.ts +++ b/src/services/types.ts @@ -399,8 +399,8 @@ namespace ts { * The language service will unconditionally attempt to provide a result. */ export interface SignatureHelpInvokedReason { - kind: "invoked", - triggerCharacter?: undefined, + kind: "invoked"; + triggerCharacter?: undefined; } /** @@ -408,11 +408,11 @@ namespace ts { * Depending on the character and the syntactic context, the request may or may not be served a result. */ export interface SignatureHelpCharacterTypedReason { - kind: "characterTyped", + kind: "characterTyped"; /** * Character that was responsible for triggering signature help. */ - triggerCharacter: SignatureHelpTriggerCharacter, + triggerCharacter: SignatureHelpTriggerCharacter; } /** @@ -422,11 +422,11 @@ namespace ts { * `triggerCharacter` can be `undefined` for a retrigger caused by a cursor move. */ export interface SignatureHelpRetriggeredReason { - kind: "retrigger", + kind: "retrigger"; /** * Character that was responsible for triggering signature help. */ - triggerCharacter?: SignatureHelpRetriggerCharacter, + triggerCharacter?: SignatureHelpRetriggerCharacter; } export interface ApplyCodeActionCommandResult {