Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
testforstephen authored and rgrunber committed Oct 3, 2023
1 parent 7e5392a commit 3b1dd81
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/TracingLanguageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ export const onDidRequestEnd: Event<TraceEvent> = requestEndEventEmitter.event;

export class TracingLanguageClient extends LanguageClient {
private isStarted: boolean = false;
private isSyntaxServer: boolean = false;

constructor(id: string, name: string, serverOptions: ServerOptions, clientOptions: LanguageClientOptions, readonly isSyntaxServer: boolean, forceDebug?: boolean) {
constructor(id: string, name: string, serverOptions: ServerOptions, clientOptions: LanguageClientOptions, forceDebug?: boolean) {
super(id, name, serverOptions, clientOptions, forceDebug);
this.isSyntaxServer = name?.includes("Syntax Server");
}

start(): Promise<void> {
Expand Down
2 changes: 1 addition & 1 deletion src/extension.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export interface TraceEvent {
*/
data?: any;
/**
* Whether the request is from the syntax server.
* Whether the response is from the syntax server.
*/
fromSyntaxServer?: boolean;
}
Expand Down
3 changes: 2 additions & 1 deletion src/standardLanguageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export class StandardLanguageClient {
}

// Create the language client and start the client.
this.languageClient = new TracingLanguageClient('java', extensionName, serverOptions, clientOptions, false, DEBUG);
this.languageClient = new TracingLanguageClient('java', extensionName, serverOptions, clientOptions, DEBUG);

this.registerCommandsForStandardServer(context, jdtEventEmitter);
fileEventHandler.registerFileEventHandlers(this.languageClient, context);
Expand Down Expand Up @@ -827,6 +827,7 @@ export function registerCodeCompletionTelemetryListener() {
duration: Math.round(traceEvent.duration * 100) / 100,
resultLength: traceEvent.resultLength || 0,
error: !!traceEvent.error,
fromSyntaxServer: !!traceEvent.fromSyntaxServer,
};
return Telemetry.sendTelemetry(Telemetry.COMPLETION_EVENT, props);
}
Expand Down
2 changes: 1 addition & 1 deletion src/syntaxLanguageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class SyntaxLanguageClient {
}

if (serverOptions) {
this.languageClient = new TracingLanguageClient('java', extensionName, serverOptions, newClientOptions, true, DEBUG);
this.languageClient = new TracingLanguageClient('java', extensionName, serverOptions, newClientOptions, DEBUG);
}

this.status = ClientStatus.initialized;
Expand Down

0 comments on commit 3b1dd81

Please sign in to comment.