Addressed comments on code style and organization.

steveluc · steveluc · commit 360e47880ebc · 2015-03-07T23:19:58.000-08:00
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -532,7 +532,7 @@ module Harness.LanguageService {
             return true;
         }
 
-        verbose() {
+        isVerbose() {
             return false;
         }
 
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -5,7 +5,7 @@
 module ts.server {
     export interface Logger {
         close(): void;
-        verbose(): boolean;
+        isVerbose(): boolean;
         enabled(): boolean;
         perftrc(s: string): void;
         info(s: string): void;
diff --git a/src/server/server.ts b/src/server/server.ts
@@ -55,7 +55,7 @@ module ts.server {
             return !!this.logFilename;
         }
 
-        verbose() {
+        isVerbose() {
             return this.enabled() && (this.level == "verbose");
         }
         
@@ -191,15 +191,15 @@ module ts.server {
         }
     }
 
-    interface LogEnv {
+    interface LogOptions {
         file?: string;
-        level?: string;
+        detailLevel?: string;
     }
 
-    function parseLogEnv(logEnvStr: string): LogEnv {
-        var logEnv: LogEnv = {};
+    function parseLogEnv(logEnvStr: string): LogOptions {
+        var logEnv: LogOptions = {};
         var args = logEnvStr.split(' ');
-        for (var i = 0, len = args.length; i < len; i++) {
+        for (var i = 0, len = args.length; i < (len - 1); i += 2) {
             var option = args[i];
             var value = args[i + 1];
             if (option && value) {
@@ -208,7 +208,7 @@ module ts.server {
                         logEnv.file = value;
                         break;
                     case "-level":
-                        logEnv.level = value;
+                        logEnv.detailLevel = value;
                         break;
                 }
             }
@@ -219,7 +219,7 @@ module ts.server {
     // TSS_LOG "{ level: "normal | verbose | terse", file?: string}"
     function createLoggerFromEnv() {
         var fileName: string = undefined;
-        var level = "normal";
+        var detailLevel = "normal";
         var logEnvStr = process.env["TSS_LOG"];
         if (logEnvStr) {
             var logEnv = parseLogEnv(logEnvStr);
@@ -229,12 +229,11 @@ module ts.server {
             else {
                 fileName = __dirname + "/.log" + process.pid.toString();
             }
-            if (logEnv.level) {
-                level = logEnv.level;
+            if (logEnv.detailLevel) {
+                detailLevel = logEnv.detailLevel;
             }
         }
-        var logger = new Logger(fileName, level);
-        return logger;
+        return new Logger(fileName, detailLevel);
     }
     // This places log file in the directory containing editorServices.js
     // TODO: check that this location is writable
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -145,8 +145,8 @@ module ts.server {
 
         send(msg: NodeJS._debugger.Message) {
             var json = JSON.stringify(msg);
-            if (this.logger.verbose()) {
-                this.logger.info(msg.type+": " + json);
+            if (this.logger.isVerbose()) {
+                this.logger.info(msg.type + ": " + json);
             }
             this.sendLineToClient('Content-Length: ' + (1 + Buffer.byteLength(json, 'utf8')) +
                 '\r\n\r\n' + json);
@@ -720,7 +720,7 @@ module ts.server {
         }
 
         onMessage(message: string) {
-            if (this.logger.verbose()) {
+            if (this.logger.isVerbose()) {
                 this.logger.info("request: " + message);
                 var start = process.hrtime();                
             }
@@ -829,14 +829,16 @@ module ts.server {
                     }
                 }
 
-                if (this.logger.verbose()) {
+                if (this.logger.isVerbose()) {
                     var elapsed = process.hrtime(start);
-                    var elapsedms = ((1e9 * elapsed[0]) + elapsed[1])/1000000.0;
+                    var seconds = elapsed[0]
+                    var nanoseconds = elapsed[1];
+                    var elapsedMs = ((1e9 * seconds) + nanoseconds)/1000000.0;
                     var leader = "Elapsed time (in milliseconds)";
                     if (!responseRequired) {
                         leader = "Async elapsed time (in milliseconds)";
                     }
-                    this.logger.msg(leader+": " + elapsedms.toFixed(4).toString(), "Perf");
+                    this.logger.msg(leader + ": " + elapsedMs.toFixed(4).toString(), "Perf");
                 }
                 if (response) {
                     this.output(response, request.command, request.seq);

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ module Harness.LanguageService {`
`532`	`532`	`return true;`
`533`	`533`	`}`
`534`	`534`
`535`		`- verbose() {`
	`535`	`+ isVerbose() {`
`536`	`536`	`return false;`
`537`	`537`	`}`
`538`	`538`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ module ts.server {`
`55`	`55`	`return !!this.logFilename;`
`56`	`56`	`}`
`57`	`57`
`58`		`- verbose() {`
	`58`	`+ isVerbose() {`
`59`	`59`	`return this.enabled() && (this.level == "verbose");`
`60`	`60`	`}`
`61`	`61`
`@@ -191,15 +191,15 @@ module ts.server {`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`		`- interface LogEnv {`
	`194`	`+ interface LogOptions {`
`195`	`195`	`file?: string;`
`196`		`- level?: string;`
	`196`	`+ detailLevel?: string;`
`197`	`197`	`}`
`198`	`198`
`199`		`- function parseLogEnv(logEnvStr: string): LogEnv {`
`200`		`- var logEnv: LogEnv = {};`
	`199`	`+ function parseLogEnv(logEnvStr: string): LogOptions {`
	`200`	`+ var logEnv: LogOptions = {};`
`201`	`201`	`var args = logEnvStr.split(' ');`
`202`		`- for (var i = 0, len = args.length; i < len; i++) {`
	`202`	`+ for (var i = 0, len = args.length; i < (len - 1); i += 2) {`
`203`	`203`	`var option = args[i];`
`204`	`204`	`var value = args[i + 1];`
`205`	`205`	`if (option && value) {`
`@@ -208,7 +208,7 @@ module ts.server {`
`208`	`208`	`logEnv.file = value;`
`209`	`209`	`break;`
`210`	`210`	`case "-level":`
`211`		`- logEnv.level = value;`
	`211`	`+ logEnv.detailLevel = value;`
`212`	`212`	`break;`
`213`	`213`	`}`
`214`	`214`	`}`
`@@ -219,7 +219,7 @@ module ts.server {`
`219`	`219`	`// TSS_LOG "{ level: "normal \| verbose \| terse", file?: string}"`
`220`	`220`	`function createLoggerFromEnv() {`
`221`	`221`	`var fileName: string = undefined;`
`222`		`- var level = "normal";`
	`222`	`+ var detailLevel = "normal";`
`223`	`223`	`var logEnvStr = process.env["TSS_LOG"];`
`224`	`224`	`if (logEnvStr) {`
`225`	`225`	`var logEnv = parseLogEnv(logEnvStr);`
`@@ -229,12 +229,11 @@ module ts.server {`
`229`	`229`	`else {`
`230`	`230`	`fileName = __dirname + "/.log" + process.pid.toString();`
`231`	`231`	`}`
`232`		`- if (logEnv.level) {`
`233`		`- level = logEnv.level;`
	`232`	`+ if (logEnv.detailLevel) {`
	`233`	`+ detailLevel = logEnv.detailLevel;`
`234`	`234`	`}`
`235`	`235`	`}`
`236`		`- var logger = new Logger(fileName, level);`
`237`		`- return logger;`
	`236`	`+ return new Logger(fileName, detailLevel);`
`238`	`237`	`}`
`239`	`238`	`// This places log file in the directory containing editorServices.js`
`240`	`239`	`// TODO: check that this location is writable`
Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,8 @@ module ts.server {`
`145`	`145`
`146`	`146`	`send(msg: NodeJS._debugger.Message) {`
`147`	`147`	`var json = JSON.stringify(msg);`
`148`		`- if (this.logger.verbose()) {`
`149`		`- this.logger.info(msg.type+": " + json);`
	`148`	`+ if (this.logger.isVerbose()) {`
	`149`	`+ this.logger.info(msg.type + ": " + json);`
`150`	`150`	`}`
`151`	`151`	`this.sendLineToClient('Content-Length: ' + (1 + Buffer.byteLength(json, 'utf8')) +`
`152`	`152`	`'\r\n\r\n' + json);`
`@@ -720,7 +720,7 @@ module ts.server {`
`720`	`720`	`}`
`721`	`721`
`722`	`722`	`onMessage(message: string) {`
`723`		`- if (this.logger.verbose()) {`
	`723`	`+ if (this.logger.isVerbose()) {`
`724`	`724`	`this.logger.info("request: " + message);`
`725`	`725`	`var start = process.hrtime();`
`726`	`726`	`}`
`@@ -829,14 +829,16 @@ module ts.server {`
`829`	`829`	`}`
`830`	`830`	`}`
`831`	`831`
`832`		`- if (this.logger.verbose()) {`
	`832`	`+ if (this.logger.isVerbose()) {`
`833`	`833`	`var elapsed = process.hrtime(start);`
`834`		`- var elapsedms = ((1e9 * elapsed[0]) + elapsed[1])/1000000.0;`
	`834`	`+ var seconds = elapsed[0]`
	`835`	`+ var nanoseconds = elapsed[1];`
	`836`	`+ var elapsedMs = ((1e9 * seconds) + nanoseconds)/1000000.0;`
`835`	`837`	`var leader = "Elapsed time (in milliseconds)";`
`836`	`838`	`if (!responseRequired) {`
`837`	`839`	`leader = "Async elapsed time (in milliseconds)";`
`838`	`840`	`}`
`839`		`- this.logger.msg(leader+": " + elapsedms.toFixed(4).toString(), "Perf");`
	`841`	`+ this.logger.msg(leader + ": " + elapsedMs.toFixed(4).toString(), "Perf");`
`840`	`842`	`}`
`841`	`843`	`if (response) {`
`842`	`844`	`this.output(response, request.command, request.seq);`