Release 0.0.77

Author: rcosta358

client/.vscodeignore

@@ -32,8 +32,6 @@ test/**
 # Server artifacts (Java project)
 ../server/**
 server/**
-# But include the built JAR
-!server/language-server-liquidjava.jar
 
 # Misc
 .DS_Store

client/package-lock.json

@@ -2,7 +2,7 @@
 	"name": "liquid-java",
 	"displayName": "LiquidJava",
 	"description": "Extending Java with Liquid Types",
-	"version": "0.0.76",
+	"version": "0.0.77",
 	"publisher": "AlcidesFonseca",
 	"repository": {
 		"type": "git",

client/package.json

@@ -17,11 +17,7 @@ export function registerWebview(context: vscode.ExtensionContext) {
     // show view command
     context.subscriptions.push(
         vscode.commands.registerCommand("liquidjava.showView", async (diagnostic?: DiagnosticRevealTarget) => {
-            if (vscode.env.uiKind === vscode.UIKind.Web) {
-                extension.webview?.showPanel();
-            } else {
-                await vscode.commands.executeCommand("liquidJavaView.focus");
-            }
+            await vscode.commands.executeCommand("liquidJavaView.focus");
             if (diagnostic) extension.webview?.sendMessage({ type: "revealDiagnostic", diagnostic });
         })
     );

client/src/services/webview.ts

@@ -8,9 +8,7 @@ import { highlightRange, openFile } from '../services/editor';
  */
 export class LiquidJavaWebviewProvider implements vscode.WebviewViewProvider {
   public static readonly viewType = "liquidJavaView";
-  public static readonly panelType = "liquidJavaPanel";
   private view?: vscode.WebviewView;
-  private panel?: vscode.WebviewPanel;
   private messageEmitter = new vscode.EventEmitter<any>();
   public readonly onDidReceiveMessage = this.messageEmitter.event;
 
@@ -22,7 +20,25 @@ export class LiquidJavaWebviewProvider implements vscode.WebviewViewProvider {
     _token: vscode.CancellationToken
   ) {
     this.view = webviewView;
-    this.initializeWebview(webviewView.webview);
+    webviewView.webview.options = {
+      enableScripts: true,
+      localResourceRoots: [this.extensionUri]
+    };
+    webviewView.webview.html = this.getHtml(webviewView.webview);
+
+    // listen for messages coming from webview
+    webviewView.webview.onDidReceiveMessage(message => {
+      // emit the message to any external listeners
+      this.messageEmitter.fire(message);
+      
+      // handle message
+      if (message.type === "openFile") {
+        openFile(message.filePath, message.line, message.character, message.highlightRange);
+      } else if (message.type === "highlight") {
+        // highlight the specified range in the current editor
+        highlightRange(vscode.window.activeTextEditor, message.range);
+      }
+    });
   }
 
   /**
@@ -31,37 +47,14 @@ export class LiquidJavaWebviewProvider implements vscode.WebviewViewProvider {
    */
   public sendMessage(message: any) {
     this.view?.webview.postMessage(message);
-    this.panel?.webview.postMessage(message);
   }
 
   /**
    * Checks if the webview is currently visible
    * @returns true if the webview is visible, false otherwise
    */
   public isVisible(): boolean {
-    return (this.view?.visible ?? false) || (this.panel?.visible ?? false);
-  }
-
-  public showPanel() {
-    if (this.panel) {
-      this.panel.reveal(vscode.ViewColumn.Beside);
-      return;
-    }
-
-    this.panel = vscode.window.createWebviewPanel(
-      LiquidJavaWebviewProvider.panelType,
-      "LiquidJava",
-      vscode.ViewColumn.Beside,
-      {
-        enableScripts: true,
-        localResourceRoots: [this.extensionUri]
-      }
-    );
-
-    this.initializeWebview(this.panel.webview);
-    this.panel.onDidDispose(() => {
-      this.panel = undefined;
-    });
+    return this.view?.visible ?? false;
   }
 
   /**
@@ -72,26 +65,4 @@ export class LiquidJavaWebviewProvider implements vscode.WebviewViewProvider {
   private getHtml(webview: vscode.Webview): string {
     return getHtml(webview, this.extensionUri);
   }
-
-  private initializeWebview(webview: vscode.Webview) {
-    webview.options = {
-      enableScripts: true,
-      localResourceRoots: [this.extensionUri]
-    };
-    webview.html = this.getHtml(webview);
-
-    // listen for messages coming from webview
-    webview.onDidReceiveMessage(message => {
-      // emit the message to any external listeners
-      this.messageEmitter.fire(message);
-
-      // handle message
-      if (message.type === "openFile") {
-        openFile(message.filePath, message.line, message.character, message.highlightRange);
-      } else if (message.type === "highlight") {
-        // highlight the specified range in the current editor
-        highlightRange(vscode.window.activeTextEditor, message.range);
-      }
-    });
-  }
 }

client/src/webview/provider.ts

@@ -6,7 +6,12 @@
 export function getStyles(): string {
     return /*css*/`
         html,
-        body,
+        body {
+            width: 100%;
+            height: 100%;
+            margin: 0;
+            box-sizing: border-box;
+        }
         #root {
             width: 100%;
             min-height: 100%;
@@ -19,6 +24,7 @@ export function getStyles(): string {
             box-sizing: inherit;
         }
         body {
+            height: 100%;
             padding: 1rem;
             font-family: var(--vscode-font-family);
             overflow: auto;