OEDependsDot view/commands

client/package.json

@@ -25,12 +25,14 @@
     "vscode": "^1.92.0"
   },
   "dependencies": {
+    "ejs": "^3.1.10",
     "find": "^0.3.0",
     "node-pty": "^1.0.0",
     "semver": "^7.6.3",
     "vscode-languageclient": "^9.0.1"
   },
   "devDependencies": {
+    "@types/ejs": "^3.1.5",
     "@types/find": "^0.2.4",
     "@types/semver": "^7.5.8",
     "@types/vscode": "^1.96.0"

client/src/extension.ts

@@ -28,6 +28,7 @@ import { type BitbakeScanResult, scanContainsData } from './lib/src/types/Bitbak
 import { reviewDiagnostics } from './language/diagnosticsSupport'
 import { embeddedLanguageDocsManager } from './language/EmbeddedLanguageDocsManager'
 import { NotificationMethod } from './lib/src/types/notifications'
+import { DependsDotView } from './ui/DependsDotView'
 
 let client: LanguageClient
 const bitbakeDriver: BitbakeDriver = new BitbakeDriver()
@@ -37,6 +38,7 @@ const bitbakeWorkspace: BitbakeWorkspace = new BitbakeWorkspace()
 let bitbakeRecipesView: BitbakeRecipesView | undefined
 let devtoolWorkspacesView: DevtoolWorkspacesView | undefined
 let terminalProvider: BitbakeTerminalProfileProvider | undefined
+let dependsDotWebview: DependsDotView | undefined
 
 export function canModifyConfig (): boolean {
   const disableConfigModification = vscode.workspace.getConfiguration('bitbake').get('disableConfigModification')
@@ -160,6 +162,8 @@ export async function activate (context: vscode.ExtensionContext): Promise<void>
   bitbakeRecipesView.registerView(context)
   devtoolWorkspacesView = new DevtoolWorkspacesView(bitBakeProjectScanner)
   devtoolWorkspacesView.registerView(context)
+  dependsDotWebview = new DependsDotView(bitBakeProjectScanner, context.extensionUri)
+  dependsDotWebview.registerView(context)
   void vscode.commands.executeCommand('setContext', 'bitbake.active', true)
   const bitbakeStatusBar = new BitbakeStatusBar(bitBakeProjectScanner)
   context.subscriptions.push(bitbakeStatusBar.statusBarItem)

client/src/language/languageClient.ts

@@ -56,27 +56,26 @@ export async function activateLanguageServer (context: ExtensionContext, bitBake
     synchronize: {
       configurationSection: 'bitbake'
     },
-    middleware: {
-      provideCompletionItem: middlewareProvideCompletion,
-      provideDefinition: middlewareProvideDefinition,
-      provideHover: middlewareProvideHover,
-      provideReferences: middlewareProvideReferences,
-      prepareRename: middlewarePrepareRename,
-      provideRenameEdits: middlewareProvideRenameEdits
-    }
+    // middleware: {
+    //   provideDefinition: middlewareProvideDefinition,
+    //   provideHover: middlewareProvideHover,
+    //   provideReferences: middlewareProvideReferences,
+    //   prepareRename: middlewarePrepareRename,
+    //   provideRenameEdits: middlewareProvideRenameEdits
+    // }
   }
 
   languages.setLanguageConfiguration('bitbake', getLanguageConfiguration())
 
-  languages.onDidChangeDiagnostics(e => {
-    e.uris.forEach(uri => {
-      void updateDiagnostics(uri)
-    })
-  })
+  // languages.onDidChangeDiagnostics(e => {
+  //   e.uris.forEach(uri => {
+  //     void updateDiagnostics(uri)
+  //   })
+  // })
 
-  context.subscriptions.push(
-    languages.registerCodeActionsProvider('bitbake', new BitbakeCodeActionProvider())
-  )
+  // context.subscriptions.push(
+  //   languages.registerCodeActionsProvider('bitbake', new BitbakeCodeActionProvider())
+  // )
 
   if (context.storageUri?.fsPath === undefined) {
     logger.error('Failed to get storage path')
@@ -113,27 +112,27 @@ export async function activateLanguageServer (context: ExtensionContext, bitBake
     void embeddedLanguageDocsManager.saveEmbeddedLanguageDocs(embeddedLanguageDocs)
   })
 
-  window.tabGroups.onDidChangeTabs((event) => {
-    [...event.opened, ...event.changed].forEach((tab) => {
-      if (tab.input instanceof TabInputText) {
-        const uri = tab.input.uri
-        if (embeddedLanguageDocsManager.embeddedLanguageDocsFolder === undefined) {
-          return
-        }
-        // Close embedded document tabs when they open automatically
-        if (uri.fsPath.includes(embeddedLanguageDocsManager.embeddedLanguageDocsFolder)) {
-          if (
-            // Prevent prompt to appear on unsaved files
-            !tab.isDirty &&
-            // Make possible to open embedded documents in a tab
-            !tab.isPreview && !tab.isActive && !tab.isPinned
-          ) {
-            void window.tabGroups.close(tab, false)
-          }
-        }
-      }
-    })
-  })
+  // window.tabGroups.onDidChangeTabs((event) => {
+  //   [...event.opened, ...event.changed].forEach((tab) => {
+  //     if (tab.input instanceof TabInputText) {
+  //       const uri = tab.input.uri
+  //       if (embeddedLanguageDocsManager.embeddedLanguageDocsFolder === undefined) {
+  //         return
+  //       }
+  //       // Close embedded document tabs when they open automatically
+  //       if (uri.fsPath.includes(embeddedLanguageDocsManager.embeddedLanguageDocsFolder)) {
+  //         if (
+  //           // Prevent prompt to appear on unsaved files
+  //           !tab.isDirty &&
+  //           // Make possible to open embedded documents in a tab
+  //           !tab.isPreview && !tab.isActive && !tab.isPinned
+  //         ) {
+  //           void window.tabGroups.close(tab, false)
+  //         }
+  //       }
+  //     }
+  //   })
+  // })
 
   // Start the client and launch the server
   await client.start()

client/src/ui/BitbakeCommands.ts

@@ -54,6 +54,8 @@ export function registerBitbakeCommands (context: vscode.ExtensionContext, bitba
     vscode.commands.registerCommand('bitbake.stop-toaster', async () => { await stopToaster(bitBakeProjectScanner.bitbakeDriver) }),
     vscode.commands.registerCommand('bitbake.clear-workspace-state', async () => { await clearAllWorkspaceState(context) }),
     vscode.commands.registerCommand('bitbake.examine-dependency-taskexp', async (uri) => { await examineDependenciesTaskexp(bitbakeWorkspace, bitBakeProjectScanner, uri) }),
+    // Repurpose to be per recipe? (and ask for image if not already supplied)
+    vscode.commands.registerCommand('bitbake.oe-depends-dot', async (uri) => { await runOeDependsDot(bitbakeWorkspace, bitBakeProjectScanner, uri) }),
     // Handles enqueued parsing requests (onSave)
     vscode.tasks.onDidEndTask((e) => {
       if (e.execution.task.name === 'Bitbake: Parse') {
@@ -615,6 +617,30 @@ export async function examineDependenciesTaskexp (bitbakeWorkspace: BitbakeWorks
   }
 }
 
+export async function runOeDependsDot (bitbakeWorkspace: BitbakeWorkspace, bitBakeProjectScanner: BitBakeProjectScanner, uri?: unknown): Promise<void> {
+  if (isTaskexpStarted) {
+    void vscode.window.showInformationMessage('taskexp is already started')
+    return
+  }
+  const chosenImage = await selectRecipe(bitbakeWorkspace, bitBakeProjectScanner, uri)
+  const chosenRecipe = await selectRecipe(bitbakeWorkspace, bitBakeProjectScanner, uri)
+  if (chosenImage !== undefined && chosenRecipe !== undefined) {
+    logger.debug(`Command: oe-depends-dot: ${chosenRecipe}`)
+    isTaskexpStarted = true
+    const process = await runBitbakeTerminal(bitBakeProjectScanner.bitbakeDriver,
+      {
+        specialCommand: `bitbake -g ${chosenRecipe} -u taskexp`
+      } as BitbakeTaskDefinition,
+    `Bitbake: taskexp: ${chosenRecipe}`)
+    process.onExit((e) => {
+      isTaskexpStarted = false
+      if (e.exitCode !== 0) {
+        void vscode.window.showErrorMessage(`Failed to start taskexp with exit code ${e.exitCode}. See terminal output.`)
+      }
+    })
+  }
+}
+
 async function openBitbakeDevshell (terminalProvider: BitbakeTerminalProfileProvider, bitbakeWorkspace: BitbakeWorkspace, bitBakeProjectScanner: BitBakeProjectScanner, uri?: unknown): Promise<vscode.Terminal | undefined> {
   const chosenRecipe = await selectRecipe(bitbakeWorkspace, bitBakeProjectScanner, uri)
   if (chosenRecipe === undefined) return