cleanup

aozgaa · aozgaa · commit 9f991d375a95 · 2017-11-08T23:05:04.000-08:00
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -16,7 +16,6 @@ namespace ts.server {
     export const ProjectInfoTelemetryEvent = "projectInfo";
     // tslint:enable variable-name
 
-    // TODO: make these inherit from protocol.Event?
     export interface ProjectsUpdatedInBackgroundEvent {
         eventName: typeof ProjectsUpdatedInBackgroundEvent;
         data: { openFiles: string[]; };
diff --git a/src/server/server.ts b/src/server/server.ts
@@ -292,7 +292,7 @@ namespace ts.server {
             if (this.installerPidReported) {
                 return;
             }
-            if (this.installer && this.eventSender) {
+            if (this.eventSender && this.installer) {
                 this.eventSender.event({ pid: this.installer.pid }, "typingsInstallerPid");
                 this.installerPidReported = true;
             }
@@ -332,10 +332,10 @@ namespace ts.server {
                 if (match) {
                     // if port is specified - use port + 1
                     // otherwise pick a default port depending on if 'debug' or 'inspect' and use its value + 1
-                    // const currentPort = match[2] !== undefined
-                    //     ? +match[2]
-                    //     : match[1].charAt(0) === "d" ? 5858 : 9229;
-                    // execArgv.push(`--${match[1]}=${currentPort + 1}`);
+                    const currentPort = match[2] !== undefined
+                        ? +match[2]
+                        : match[1].charAt(0) === "d" ? 5858 : 9229;
+                    execArgv.push(`--${match[1]}=${currentPort + 1}`);
                     break;
                 }
             }
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -315,7 +315,13 @@ namespace ts.server {
             else if (this.eventPort) {
                 const s = net.connect({ port: this.eventPort }, () => {
                     this.eventSocket = s;
-                    this.clearSocketEventQueue();
+                    if (this.socketEventQueue) {
+                        // flush queue.
+                        for (const event of this.socketEventQueue) {
+                            this.writeToEventSocket(event.info, event.eventName);
+                        }
+                        this.socketEventQueue = undefined;
+                    }
                 });
 
                 this.event = function <T>(info: T, eventName: string) {
@@ -374,13 +380,6 @@ namespace ts.server {
             this.gcTimer = new GcTimer(this.host, /*delay*/ 7000, this.logger);
         }
 
-        private clearSocketEventQueue() {
-            for (const event of this.socketEventQueue) {
-                this.writeToEventSocket(event.info, event.eventName);
-            }
-            this.socketEventQueue = undefined;
-        }
-
         private writeToEventSocket(info: any, eventName: string): void {
             this.eventSocket.write(formatMessage({ seq: 0, type: "event", event: eventName, body: info }, this.logger, Buffer.byteLength, this.host.newLine), "utf8");
         }
@@ -451,9 +450,11 @@ namespace ts.server {
         }
 
         public send(msg: protocol.Message) {
-            if (msg.type === "event") {
-                Debug.assert(this.canUseEvents);
-                Debug.assert(!this.eventPort);
+            if (msg.type === "event" && !this.canUseEvents) {
+                if (this.logger.hasLevel(LogLevel.verbose)) {
+                    this.logger.info(`Session does not support events: ignored event: ${JSON.stringify(msg)}`);
+                }
+                return;
             }
             this.host.write(formatMessage(msg, this.logger, this.byteLength, this.host.newLine));
         }
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -6947,7 +6947,6 @@ declare namespace ts.server {
         readonly event: EventSender["event"];
         private socketEventQueue;
         constructor(opts: SessionOptions);
-        private clearSocketEventQueue();
         private writeToEventSocket(info, eventName);
         private sendRequestCompletedEvent(requestId);
         private defaultEventHandler(event);

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ namespace ts.server {`
`292`	`292`	`if (this.installerPidReported) {`
`293`	`293`	`return;`
`294`	`294`	`}`
`295`		`- if (this.installer && this.eventSender) {`
	`295`	`+ if (this.eventSender && this.installer) {`
`296`	`296`	`this.eventSender.event({ pid: this.installer.pid }, "typingsInstallerPid");`
`297`	`297`	`this.installerPidReported = true;`
`298`	`298`	`}`
`@@ -332,10 +332,10 @@ namespace ts.server {`
`332`	`332`	`if (match) {`
`333`	`333`	`// if port is specified - use port + 1`
`334`	`334`	`// otherwise pick a default port depending on if 'debug' or 'inspect' and use its value + 1`
`335`		`- // const currentPort = match[2] !== undefined`
`336`		`- // ? +match[2]`
`337`		`- // : match[1].charAt(0) === "d" ? 5858 : 9229;`
`338`		- // execArgv.push(`--${match[1]}=${currentPort + 1}`);
	`335`	`+ const currentPort = match[2] !== undefined`
	`336`	`+ ? +match[2]`
	`337`	`+ : match[1].charAt(0) === "d" ? 5858 : 9229;`
	`338`	+ execArgv.push(`--${match[1]}=${currentPort + 1}`);
`339`	`339`	`break;`
`340`	`340`	`}`
`341`	`341`	`}`