From 9d70e7cd7f78787591c5f0b1addae148d1f1b132 Mon Sep 17 00:00:00 2001
From: Julien Stebenne <julien.stebenne@gmail.com>
Date: Sat, 30 Mar 2019 00:49:50 -0400
Subject: [PATCH] Updated panel to use Webview API

(Also removed some dead code)
---
 assets/profile.html.eex |  2 +-
 src/profile-provider.ts |  6 +++++-
 src/xp-counter.ts       | 30 ++++++++++++++----------------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/assets/profile.html.eex b/assets/profile.html.eex
index 19ea7df..ea66354 100644
--- a/assets/profile.html.eex
+++ b/assets/profile.html.eex
@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="file:///${style}">
+<link rel="stylesheet" href="${style}">
 <div class="profile">
   <h3> ${profile.user} <sup>${profile.level}</sup> ${profile.total_xp} xp
     <% if( profile.new_xp > 0 ) { %>
diff --git a/src/profile-provider.ts b/src/profile-provider.ts
index 089110e..f0ba659 100644
--- a/src/profile-provider.ts
+++ b/src/profile-provider.ts
@@ -2,6 +2,7 @@
 import * as fs from 'fs';
 import { CancellationToken, Event, ExtensionContext, TextDocumentContentProvider, Uri } from "vscode";
 import { CodeStatsAPI } from "./code-stats-api";
+import * as path from 'path';
 
 import template = require('lodash.template');
 
@@ -88,7 +89,10 @@ export class ProfileProvider implements TextDocumentContentProvider {
     
       let html = template(htmlTemplate);
           
-      return html({profile: profile, languages: languages, machines: machines, style: this.context.asAbsolutePath("assets/profile.css")});
+      const stylePath = Uri.file(path.join(this.context.extensionPath, 'assets', 'profile.css'));
+      const styleSrc = stylePath.with({scheme: 'vscode-resource'});
+
+      return html({profile: profile, languages: languages, machines: machines, style: styleSrc});
 
     });
   }
diff --git a/src/xp-counter.ts b/src/xp-counter.ts
index 1fa1d24..6b96ad7 100644
--- a/src/xp-counter.ts
+++ b/src/xp-counter.ts
@@ -1,4 +1,3 @@
-// tslint:disable-next-line:max-line-length
 import {
   Disposable,
   workspace,
@@ -10,13 +9,13 @@ import {
   TextDocument,
   StatusBarAlignment,
   TextDocumentChangeEvent,
-  Range,
   WorkspaceConfiguration,
   ExtensionContext
 } from "vscode";
 import { Pulse } from "./pulse";
 import { CodeStatsAPI } from "./code-stats-api";
 import { ProfileProvider } from "./profile-provider";
+import * as path from 'path';
 
 export class XpCounter {
   private combinedDisposable: Disposable;
@@ -25,23 +24,11 @@ export class XpCounter {
   private api: CodeStatsAPI;
   private updateTimeout: any;
 
-  //    private languages: Array<string> = ["typescript", "javascript"];
-
   // wait 10s after each change in the document before sending an update
   private UPDATE_DELAY = 10000;
 
-
   constructor(context: ExtensionContext) {
     this.pulse = new Pulse();
-
-    /* // print out supported language names
-        let allLanguages = languages.getLanguages().then(
-            (result => {
-                console.log(JSON.stringify(result));
-            })
-        );
-        */
-
     this.initAPI();
 
     let subscriptions: Disposable[] = [];
@@ -68,8 +55,19 @@ export class XpCounter {
         window.showErrorMessage('codestats.username configuration setting is missing');
         return;
       }
+      
+      const panel = window.createWebviewPanel(
+        'codeStatsPanel',
+        'Code::Stats Profile',
+        ViewColumn.Two,
+        {
+          localResourceRoots: [Uri.file(path.join(context.extensionPath, 'assets'))]
+        }
+      );
 
-      commands.executeCommand('vscode.previewHtml',  Uri.parse('code-stats://profile'), ViewColumn.Two, 'Code::Stats Profile');
+      workspace.openTextDocument(Uri.parse('code-stats://profile')).then((value) => {
+        panel.webview.html = value.getText();
+      });
     }));
     
     workspace.onDidChangeTextDocument(
@@ -154,7 +152,7 @@ export class XpCounter {
       `
     );
 
-    if( this.api != null )
+    if(this.api != null )
       this.api.updateSettings(apiKey, apiURL, userName);
     else
       this.api = new CodeStatsAPI(apiKey,apiURL,userName);