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

Fix formatting and version for TS Server issue report

Browse source
This commit is contained in:
Matt Bierner 2020-02-20 21:34:20 -08:00
parent adff1db8de
commit d17a017c0b
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/typescript-language-features/src/tsServer/serverError.ts
View file

@ -20,7 +20,7 @@ export class TypeScriptServerError extends Error {
private constructor(
serverId: string,
version: TypeScriptVersion,
public readonly version: TypeScriptVersion,
private readonly response: Proto.Response,
public readonly serverMessage: string | undefined,
public readonly serverStack: string | undefined

9
extensions/typescript-language-features/src/typescriptServiceClient.ts
View file

@ -529,7 +529,6 @@ export default class TypeScriptServiceClient extends Disposable implements IType
id: MessageAction;
}
const previousVersion = this.apiVersion;
const previousState = this.serverState;
this.serverState = ServerState.None;
@ -570,7 +569,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
prompt.then(item => {
if (item?.id === MessageAction.reportIssue) {
const args = previousState.type === ServerState.Type.Errored && previousState.error instanceof TypeScriptServerError
? getReportIssueArgsForError(previousState.error, previousVersion)
? getReportIssueArgsForError(previousState.error)
: undefined;
return vscode.commands.executeCommand('workbench.action.openIssueReporter', args);
}
@ -875,7 +874,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
}
}
function getReportIssueArgsForError(error: TypeScriptServerError, apiVersion: API): { issueTitle: string, issueBody: string } | undefined {
function getReportIssueArgsForError(error: TypeScriptServerError): { issueTitle: string, issueBody: string } | undefined {
if (!error.serverStack || !error.serverMessage) {
return undefined;
}
@ -885,7 +884,7 @@ function getReportIssueArgsForError(error: TypeScriptServerError, apiVersion: AP
return {
issueTitle: `TS Server fatal error: ${error.serverMessage}`,
issueBody: `**TypeScript Version:** ${apiVersion.fullVersionString}
issueBody: `**TypeScript Version:** ${error.version.apiVersion?.fullVersionString}
**Steps to reproduce crash**
@ -893,7 +892,7 @@ function getReportIssueArgsForError(error: TypeScriptServerError, apiVersion: AP
2.
3.
** TS Server Error Stack **
**TS Server Error Stack**
\`\`\`
${error.serverStack}