Fix documentation viewer (#91)

- Closes #73 NB: the links inside the viewer don't work and that's expected. See - #37 https://github.com/anoma/vscode-juvix/assets/1428088/21cdd93c-6ffd-40b1-a959-ee5e3809cbff
anoma · May 31, 2023 · d8e781f · d8e781f
1 parent 762fa64
commit d8e781f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 38 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -83,10 +83,8 @@ export class JuvixConfig {
       const juvixBuildDir = buildDir.toString();
       try {
         if (fs.existsSync(juvixBuildDir)) {
-          debugChannel.info(`Directory exists: ${juvixBuildDir}`);
           return juvixBuildDir;
         } else {
-          debugChannel.info(`Directory does not exist: ${juvixBuildDir}`);
           const tmpJuvixDir = useTmpDir();
           return tmpJuvixDir
         }

diff --git a/src/extension.ts b/src/extension.ts
@@ -22,6 +22,7 @@ import * as codelens from './codelens';
 export async function activate(context: vscode.ExtensionContext) {
   debugChannel.clear();
   statusBar.activate(context);
+  codelens.activate(context);
   syntaxHighlighter.activate(context);
   goToDefinition.activate(context);
   hoverInfo.activate(context);

diff --git a/src/judoc.ts b/src/judoc.ts
@@ -6,7 +6,8 @@ import * as fs from 'fs';
 import { debugChannel } from './utils/debug';
 import { JuvixConfig } from './config';
 import { isJuvixFile } from './utils/base';
-import { juvixRoot } from './root';
+import * as path from 'path';
+import { getModuleName } from './module';
 
 export function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(
@@ -65,20 +66,17 @@ export class JudocPanel {
 
   private _panel: vscode.WebviewPanel;
   private _disposables: vscode.Disposable[] = [];
-  // public  readonly htmlFolder : string;
 
   public static createOrShow(onlySource = false) {
     this.onlySource = onlySource;
     const editor = vscode.window.activeTextEditor;
     if (!editor || !isJuvixFile(editor.document)) return;
     this.juvixDocument = editor.document;
-    // If we already have a panel, show it.
+
     if (JudocPanel.currentPanel) {
       JudocPanel.currentPanel._panel.reveal();
       return;
     }
-
-    // Otherwise, create a new panel.
     const panel = vscode.window.createWebviewPanel(
       JudocPanel.viewType,
       'Html preview',
@@ -99,7 +97,6 @@ export class JudocPanel {
 
   private constructor(panel: vscode.WebviewPanel, _htmlFolder?: string) {
     this._panel = panel;
-    // this.htmlFolder = htmlFolder;
 
     this._disposables.push(
       vscode.workspace.onDidSaveTextDocument(document => {
@@ -112,15 +109,6 @@ export class JudocPanel {
       })
     );
 
-    // this._disposables.push(
-    //   vscode.workspace.onDidCloseTextDocument((document) => {
-    //     if (document === JudocPanel.juvixDocument) {
-    //       this._panel.dispose();
-    //       // this.dispose();
-    //     }
-    //   })
-    // );
-
     this._disposables.push(
       vscode.workspace.onDidOpenTextDocument(document => {
         if (!isJuvixFile(document)) return;
@@ -204,30 +192,23 @@ export class JudocPanel {
     const doc = JudocPanel.juvixDocument;
     if (!doc || (doc && !isJuvixFile(doc))) return;
 
-    const docFolder = vscode.workspace.getWorkspaceFolder(doc.uri);
-    if (!docFolder) return;
-    const config = new JuvixConfig();
-
-    // debugChannel.info("htmlFolder> " + this.htmlFolder);
-
-    // const judocDocFolderUri = vscode.Uri.file(this.htmlFolder);
-    // const judocDocFolderUri = vscode.Uri.file(config.getInternalBuildDir());
-    const judocDocFolderUri = vscode.Uri.joinPath(docFolder.uri, 'html');
-    // const buildDir = config.getInternalBuildDir();
+    const fileName = doc.fileName;
+    const parsedFilepath = path.parse(fileName);
+    const folderDocument = path.join(parsedFilepath.dir, 'docs', path.sep);
+    const judocDocFolderUri = vscode.Uri.file(folderDocument);
 
     const { spawnSync } = require('child_process');
 
     const vscodePrefix =
-      webview.asWebviewUri(judocDocFolderUri).toString() + '/';
-
+      webview.asWebviewUri(judocDocFolderUri).toString();
+    const config = new JuvixConfig();
     const judocCall = [
       config.getJuvixExec(),
       '--internal-build-dir',
       judocDocFolderUri.fsPath,
       'html',
       JudocPanel.onlySource ? '--only-source' : '',
       '--output-dir',
-      // this.htmlFolder,
       judocDocFolderUri.fsPath,
       '--non-recursive',
       '--prefix-assets',
@@ -236,6 +217,7 @@ export class JudocPanel {
       vscodePrefix,
       doc.uri.fsPath,
     ].join(' ');
+
     debugChannel.info('Judoc call', judocCall);
 
     const ls = spawnSync(judocCall, {
@@ -248,11 +230,7 @@ export class JudocPanel {
       debugChannel.error('Judoc failed', errMsg);
       throw new Error(errMsg);
     }
-    const projRoot = juvixRoot();
-    const htmlFilename = doc.uri.fsPath
-      .replace(projRoot, '')
-      .replace('/', '.')
-      .replace('.juvix', '.html');
+    const htmlFilename = getModuleName(doc) + '.html';
 
     const htmlByJudocForDoc = vscode.Uri.joinPath(
       judocDocFolderUri,

diff --git a/src/module.ts b/src/module.ts
@@ -2,7 +2,7 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 import * as vscode from 'vscode';
-import { juvixRoot, globalJuvixRoot, isUsingGlobalRoot } from './root';
+import { juvixRoot, isUsingGlobalRoot } from './root';
 import * as path from 'path';
 import { isJuvixFile } from './utils/base';
 
@@ -25,5 +25,4 @@ export function getModuleName(document: vscode.TextDocument): string | undefined
     }
     return moduleName;
 
-
 }
diff --git a/src/root.ts b/src/root.ts
@@ -32,7 +32,6 @@ export function juvixRoot() {
     return undefined;
 }
 
-
 export function globalJuvixRoot() : string {
     const juvixVersion = getInstalledNumericVersion();
     const homeUserPath = process.env.HOME;