workspace path acquiring implemented

jonah-iden · Aug 31, 2022 · cf87346 · cf87346
1 parent d53824e
commit cf87346
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/typefox-test/package.json b/typefox-test/package.json
@@ -12,6 +12,7 @@
     "@theia/core": "1.25.0",
     "@theia/filesystem": "1.25.0",
     "@theia/file-search": "1.25.0",
+    "@theia/workspace": "1.25.0",
     "toml": "3.0.0"
   },
   "devDependencies": {

diff --git a/typefox-test/src/browser/typefox-test-contribution.ts b/typefox-test/src/browser/typefox-test-contribution.ts
@@ -1,5 +1,6 @@
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { Command, CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry} from '@theia/core/lib/common';
+import { WorkspaceService } from '@theia/workspace/lib/browser'
 import { CommonMenus, FrontendApplication, FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { IDependencyVersionCheckServer } from "../common/dependency-version-checker-protocoll";
 
@@ -13,11 +14,12 @@ export const dependencyVersionCheckCommand: Command = {
 export class TypefoxTestCommandContribution implements CommandContribution {
 
     @inject(IDependencyVersionCheckServer) depCheckServer: IDependencyVersionCheckServer;
+    @inject(WorkspaceService) workspaceService: WorkspaceService;
 
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(dependencyVersionCheckCommand, {
             execute: async () => {
-                const mismatches = await this.depCheckServer.analyzeDependencies();
+                const mismatches = await this.depCheckServer.analyzeDependencies(await this.workspaceService.tryGetRoots().map(r => r.resource.toString()));
                 console.log("mismatches recieved");
                 console.log(mismatches);
             }

diff --git a/typefox-test/src/common/dependency-version-checker-protocoll.ts b/typefox-test/src/common/dependency-version-checker-protocoll.ts
@@ -4,5 +4,5 @@ export const servicePath = "/services/dependencyVersionChecker";
 
 export const IDependencyVersionCheckServer = Symbol.for("DependencyVersionCheckerServer")
 export interface IDependencyVersionCheckServer {
-    analyzeDependencies(): Promise<string[]>;
+    analyzeDependencies(rootPath: string[]): Promise<string[]>;
 }
diff --git a/typefox-test/src/node/dependency-version-checker-server.ts b/typefox-test/src/node/dependency-version-checker-server.ts
@@ -15,9 +15,9 @@ export class DependencyVersionCheckerServer implements IDependencyVersionCheckSe
     /**
      * analyzes the dependencies from the cargo.toml and returns a list of mismatches
      */
-    async analyzeDependencies(): Promise<string[]> {
+    async analyzeDependencies(rootPaths: string[]): Promise<string[]> {
         // this path is hardcoded right now for my local test workspace because i couldn't figure out where to get the acutal path from
-        const cargoTomlFiles: string[] = await this.fileSearchService.find("cargo.toml", {rootUris: ["d:/Projekte/Kleinere_Projekte/Rust"]});
+        const cargoTomlFiles: string[] = await this.fileSearchService.find("cargo.toml", {rootUris: rootPaths});
         const allDependencies: Dependency[] = []
         for(let path of cargoTomlFiles) {
             const tomlData = toml.parse(await this.getFileContent(path));