Cleanup watch and render functions (#79)

* prevent document is not defined error

* always start watch even on coverage error for active file

* add lcov file content check to prevent failed to parse error

* convert icon to png

* remove uuid use unique machine id

* increment image vscode version

* increment appveyor code version

appveyor.yml

@@ -1,5 +1,5 @@
 environment:
-  CODE_VERSION: 1.12.2
+  CODE_VERSION: 1.14.0
 
 install:
   - ps: Install-Product node 6.11.0 x64

package.json

@@ -8,15 +8,15 @@
     "type": "git",
     "url": "https://github.com/ryanluker/vscode-coverage-gutters"
   },
-  "icon": "images/icon.svg",
+  "icon": "images/icon.png",
   "galleryBanner": {
     "color": "#24381b",
     "theme": "dark"
   },
   "bugs": "https://github.com/ryanluker/vscode-coverage-gutters/issues",
   "publisher": "ryanluker",
   "engines": {
-    "vscode": "^1.11.0"
+    "vscode": "^1.14.0"
   },
   "categories": [
     "Other"

src/extension.ts

@@ -9,7 +9,6 @@ import {Fs} from "./wrappers/fs";
 import {Glob} from "./wrappers/glob";
 import {LcovParse} from "./wrappers/lcov-parse";
 import {Request} from "./wrappers/request";
-import {Uuid} from "./wrappers/uuid";
 import {Vscode} from "./wrappers/vscode";
 
 const fsImpl = new Fs();
@@ -19,7 +18,7 @@ const globImpl = new Glob();
 
 export function activate(context: vscode.ExtensionContext) {
     const enableMetrics = vscode.workspace.getConfiguration("telemetry").get("enableTelemetry") as boolean;
-    const reporter = new Reporter(new Request(), new Uuid(), "", enableMetrics);
+    const reporter = new Reporter(new Request(), vscode.env.machineId, "", enableMetrics);
     const configStore = new Config(vscodeImpl, context, reporter).get();
     const statusBarToggler = new StatusBarToggler(configStore);
     const lcov = new Lcov(configStore, globImpl, vscodeImpl, fsImpl);

src/gutters.ts

@@ -63,7 +63,10 @@ export class Gutters {
         const textEditor = window.activeTextEditor;
         try {
             const lcovPath = await this.lcov.find();
-            await this.loadAndRenderCoverage(textEditor, lcovPath);
+
+            // When we try to load the coverage when watch is actived we dont want to error
+            // if the active file has no coverage
+            this.loadAndRenderCoverage(textEditor, lcovPath).catch(() => {});
 
             this.lcovWatcher = vscodeImpl.watchFile(lcovPath);
             this.lcovWatcher.onDidChange((event) => this.renderCoverageOnVisible(lcovPath));
@@ -124,6 +127,7 @@ export class Gutters {
     }
 
     private async loadAndRenderCoverage(textEditor: TextEditor, lcovPath: string): Promise<void> {
+        if (!textEditor.document) { return ; }
         const lcovFile = await this.lcov.load(lcovPath);
         const file = textEditor.document.fileName;
         const coveredLines = await this.indicators.extract(lcovFile, file);

src/indicators.ts

@@ -42,6 +42,7 @@ export class Indicators {
     }
 
     public extract(lcovFile: string, file: string): Promise<LcovSection> {
+        if (lcovFile === "") { return Promise.reject("No coverage details inside lcov file!"); }
         return new Promise<LcovSection>((resolve, reject) => {
             this.parse.source(lcovFile, (err, data) => {
                 if (err) { return reject(err); }

src/reporter.ts

@@ -1,19 +1,18 @@
 import {Request} from "./wrappers/request";
-import {Uuid} from "./wrappers/uuid";
 
 const EXT_NAME = "vscode-coverage-gutters";
-const EXT_VERSION = "1.0.0";
+const EXT_VERSION = "1.1.0";
 
 export class Reporter {
     private readonly cid: string;
     private readonly enableMetrics: boolean;
     private readonly gaTrackingId: string;
     private readonly request: Request;
 
-    constructor(request: Request, uuid: Uuid, gaTrackingId: string, enableMetrics: boolean) {
+    constructor(request: Request, machineId: string, gaTrackingId: string, enableMetrics: boolean) {
         this.gaTrackingId = gaTrackingId;
         this.request = request;
-        this.cid = uuid.get();
+        this.cid = machineId;
         this.enableMetrics = enableMetrics;
     }
 

test/reporter.test.ts

@@ -11,11 +11,7 @@ suite("Reporter Tests", function() {
             },
         };
 
-        const fakeUuid = {
-            get() {
-                return "fakeuuidhere";
-            },
-        };
+        const fakeUuid = "fakeuuidhere";
 
         const reporter = new Reporter(fakeRequest, fakeUuid, "", false);
         reporter.sendEvent("test", "action");
@@ -30,11 +26,7 @@ suite("Reporter Tests", function() {
             },
         };
 
-        const fakeUuid = {
-            get() {
-                return "fakeuuidhere";
-            },
-        };
+        const fakeUuid = "fakeuuidhere";
 
         const reporter = new Reporter(fakeRequest, fakeUuid, "", true);
         reporter.sendEvent("test", "action");
@@ -49,11 +41,7 @@ suite("Reporter Tests", function() {
             },
         };
 
-        const fakeUuid = {
-            get() {
-                return "fakeuuidhere";
-            },
-        };
+        const fakeUuid = "fakeuuidhere";
 
         const reporter = new Reporter(fakeRequest, fakeUuid, "", true);
         reporter.sendEvent("test", "action");
@@ -68,11 +56,7 @@ suite("Reporter Tests", function() {
             },
         };
 
-        const fakeUuid = {
-            get() {
-                return "fakeuuidhere";
-            },
-        };
+        const fakeUuid = "fakeuuidhere";
 
         const reporter = new Reporter(fakeRequest, fakeUuid, "123", true);
         reporter.sendEvent("test", "action");