npm - @aws/lsp-codewhisperer - Versions diffs - 0.0.39 → 0.0.41 - Mend

@aws/lsp-codewhisperer 0.0.39 → 0.0.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (432) hide show

package/out/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.js CHANGED Viewed

@@ -4,6 +4,7 @@ exports.JSTSDependencyHandler = void 0;
 const LanguageDependencyHandler_1 = require("./LanguageDependencyHandler");
 const path = require("path");
 const fs = require("fs");
+const DependencyWatcher_1 = require("./DependencyWatcher");
 /*
  * JSTS Dependency Handler
  *
@@ -165,14 +166,13 @@ class JSTSDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
             }
             this.logging.log(`Setting up Javascript/Typescript dependency watcher for ${packageJsonPath}`);
             try {
-                const watcher = fs.watch(packageJsonPath, async (eventType) => {
-                    if (eventType === 'change') {
-                        this.logging.log(`Change detected in ${packageJsonPath}`);
-                        const updatedDependencyMap = this.generateDependencyMap(jstsDependencyInfo);
-                        let zips = await this.compareAndUpdateDependencyMap(jstsDependencyInfo.workspaceFolder, updatedDependencyMap, true);
-                        this.emitDependencyChange(jstsDependencyInfo.workspaceFolder, zips);
-                    }
-                });
+                const callBackDependencyUpdate = async (events) => {
+                    this.logging.log(`Change detected in ${packageJsonPath}`);
+                    const updatedDependencyMap = this.generateDependencyMap(jstsDependencyInfo);
+                    let zips = await this.compareAndUpdateDependencyMap(jstsDependencyInfo.workspaceFolder, updatedDependencyMap, true);
+                    this.emitDependencyChange(jstsDependencyInfo.workspaceFolder, zips);
+                };
+                const watcher = new DependencyWatcher_1.DependencyWatcher(packageJsonPath, callBackDependencyUpdate, this.logging, this.DEPENDENCY_WATCHER_EVENT_BATCH_INTERVAL);
                 this.dependencyWatchers.set(packageJsonPath, watcher);
             }
             catch (error) {
@@ -189,7 +189,7 @@ class JSTSDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
                 const packageJsonPath = jstsDependencyInfo.packageJsonPath;
                 if (this.dependencyWatchers.has(packageJsonPath)) {
                     this.logging.log(`Disposing dependency watcher for ${packageJsonPath}`);
-                    this.dependencyWatchers.get(packageJsonPath)?.close();
+                    this.dependencyWatchers.get(packageJsonPath)?.dispose();
                     this.dependencyWatchers.delete(packageJsonPath);
                 }
             }

package/out/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JSTSDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.ts"],"names":[],"mappings":";;;AAAA,2EAAuG;AACvG,6BAA4B;AAC5B,yBAAwB;~~AASxB~~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~~OAAO~~,GAAG,~~EAAE,CAAC,~~KAAK,~~CAAC~~,~~eAAe~~,EAAE,~~KAAK,EAAC,SAAS,EAAC,~~EAAE;oBACxD,IAAI,~~SAAS,KAAK,QAAQ,EAAE,~~CAAC~~;wBACzB~~,~~IAAI,CAAC,~~OAAO,CAAC,GAAG,CAAC,sBAAsB,eAAe,EAAE,CAAC,CAAA;~~wBACzD~~,MAAM,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAA;~~wBAC3E~~,IAAI,IAAI,GAAmB,MAAM,IAAI,CAAC,6BAA6B,CAC/D,kBAAkB,CAAC,eAAe,EAClC,oBAAoB,EACpB,IAAI,CACP,CAAA;~~wBACD~~,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;~~oBACvE~~,CAAC;~~gBACL~~,CAAC,CAAC,CAAA;~~gBACF~~,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAA;YACzD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,eAAe,KAAK,KAAK,EAAE,CAAC,CAAA;YAClF,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,mDAAmD;IAC1C,KAAK,CAAC,6BAA6B,CAAC,KAAe,EAAE,eAAiC,IAAkB,CAAC;IACzG,yBAAyB,CAC9B,cAAsB,EACtB,cAAsB,EACtB,aAAsC,IACjC,CAAC;IAEV,eAAe,CAAC,eAAgC;QAC5C,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,kBAAsC,EAAE,EAAE;YACxE,IAAI,eAAe,CAAC,GAAG,KAAK,kBAAkB,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;gBACjE,MAAM,eAAe,GAAG,kBAAkB,CAAC,eAAe,CAAA;gBAC1D,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;oBAC/C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oCAAoC,eAAe,EAAE,CAAC,CAAA;oBACvE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,~~KAAK~~,EAAE,CAAA;~~oBACrD~~,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;gBACnD,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,qBAAqB,CAAC,eAAgC;QAClD,sDAAsD;QACtD,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CACtD,CAAC,kBAAsC,EAAE,EAAE,CAAC,kBAAkB,CAAC,eAAe,CAAC,GAAG,KAAK,eAAe,CAAC,GAAG,CAC7G,CAAA;IACL,CAAC;CACJ;~~AArND~~,~~sDAqNC~~"}
1	+ {"version":3,"file":"JSTSDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.ts"],"names":[],"mappings":"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"}

package/out/language-server/workspaceContext/dependency/dependencyHandler/JavaDependencyHandler.js CHANGED Viewed

@@ -5,6 +5,7 @@ const LanguageDependencyHandler_1 = require("./LanguageDependencyHandler");
 const path = require("path");
 const fs = require("fs");
 const xml2js = require("xml2js");
+const DependencyWatcher_1 = require("./DependencyWatcher");
 /*
  * Java Dependency Handler
  *
@@ -76,14 +77,13 @@ class JavaDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
             }
             this.logging.log(`Setting up Java dependency watcher for ${dotClasspathPath}`);
             try {
-                const watcher = fs.watch(dotClasspathPath, async (eventType, filename) => {
-                    if (eventType === 'change') {
-                        this.logging.log(`Change detected in ${dotClasspathPath}`);
-                        const updatedDependencyMap = this.generateDependencyMap(javaDependencyInfo);
-                        let zips = await this.compareAndUpdateDependencyMap(javaDependencyInfo.workspaceFolder, updatedDependencyMap, true);
-                        this.emitDependencyChange(javaDependencyInfo.workspaceFolder, zips);
-                    }
-                });
+                const callBackDependencyUpdate = async (events) => {
+                    this.logging.log(`Change detected in ${dotClasspathPath}`);
+                    const updatedDependencyMap = this.generateDependencyMap(javaDependencyInfo);
+                    let zips = await this.compareAndUpdateDependencyMap(javaDependencyInfo.workspaceFolder, updatedDependencyMap, true);
+                    this.emitDependencyChange(javaDependencyInfo.workspaceFolder, zips);
+                };
+                const watcher = new DependencyWatcher_1.DependencyWatcher(dotClasspathPath, callBackDependencyUpdate, this.logging, this.DEPENDENCY_WATCHER_EVENT_BATCH_INTERVAL);
                 this.dependencyWatchers.set(dotClasspathPath, watcher);
             }
             catch (error) {
@@ -145,7 +145,7 @@ class JavaDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
                 const dotClasspathPath = javaDependencyInfo.dotClasspathPath;
                 if (this.dependencyWatchers.has(dotClasspathPath)) {
                     this.logging.log(`Disposing dependency watcher for ${dotClasspathPath}`);
-                    this.dependencyWatchers.get(dotClasspathPath)?.close();
+                    this.dependencyWatchers.get(dotClasspathPath)?.dispose();
                     this.dependencyWatchers.delete(dotClasspathPath);
                 }
             }

package/out/language-server/workspaceContext/dependency/dependencyHandler/JavaDependencyHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JavaDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/JavaDependencyHandler.ts"],"names":[],"mappings":";;;AAAA,2EAAuG;AACvG,6BAA4B;AAC5B,yBAAwB;AACxB,iCAAgC;~~AAQhC~~;;;;GAIG;AACH,MAAa,qBAAsB,SAAQ,qDAA6C;IAC5E,mBAAmB,GAAyB,EAAE,CAAA;IAC9C,aAAa,GAAW,cAAc,CAAA;IAE9C;;;;;OAKG;IACH,QAAQ,CAAC,UAAkB,EAAE,eAAgC;QACzD,IAAI,MAAM,GAA8B,IAAI,CAAA;QAC5C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;QAC5D,IAAI,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;YAC5E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,UAAU,EAAE,CAAC,CAAA;YACrD,MAAM,GAAG;gBACL,MAAM,EAAE,UAAU;gBAClB,gBAAgB,EAAE,gBAAgB;gBAClC,eAAe,EAAE,eAAe;aACnC,CAAA;YACD,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACzC,CAAC;QAED,OAAO,MAAM,KAAK,IAAI,CAAA;IAC1B,CAAC;IAED;;;;;;OAMG;IACH,qBAAqB,CAAC,OAA0B;QAC5C,6DAA6D;QAC7D,MAAM,+BAA+B,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;YACzF,OAAO,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;QAC/D,CAAC,CAAC,CAAA;QAEF,KAAK,MAAM,kBAAkB,IAAI,+BAA+B,EAAE,CAAC;YAC/D,6CAA6C;YAC7C,IAAI,CAAC;gBACD,IAAI,sBAAsB,GAA4B,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAA;gBACpG,IAAI,CAAC,6BAA6B,CAAC,kBAAkB,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC,KAAK,CAChG,KAAK,CAAC,EAAE;oBACJ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAA;gBACrE,CAAC,CACJ,CAAA;gBACD,yBAAyB;gBACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CACZ,mCAAmC,sBAAsB,CAAC,IAAI,UAAU,kBAAkB,CAAC,MAAM,EAAE,CACtG,CAAA;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAA;YACrE,CAAC;QACL,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,OAA0B;QACpC,6DAA6D;QAC7D,MAAM,6BAA6B,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;YACvF,OAAO,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAA;QAC/D,CAAC,CAAC,CAAA;QAEF,6BAA6B,CAAC,OAAO,CAAC,CAAC,kBAAsC,EAAE,EAAE;YAC7E,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,gBAAgB,CAAA;YAC5D,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAChD,OAAM;YACV,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,0CAA0C,gBAAgB,EAAE,CAAC,CAAA;YAC9E,IAAI,CAAC;gBACD,MAAM,~~OAAO~~,GAAG,~~EAAE,CAAC,~~KAAK,~~CAAC,gBAAgB,~~EAAE,~~KAAK~~,EAAE,~~SAAS,~~EAAE~~,QAAQ,EAAE,EAAE~~;~~oBACrE~~,IAAI,~~SAAS,KAAK,QAAQ,EAAE,~~CAAC~~;wBACzB~~,~~IAAI,CAAC,~~OAAO,CAAC,GAAG,CAAC,sBAAsB,gBAAgB,EAAE,CAAC,CAAA;~~wBAC1D~~,MAAM,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,CAAA;~~wBAC3E~~,IAAI,IAAI,GAAmB,MAAM,IAAI,CAAC,6BAA6B,CAC/D,kBAAkB,CAAC,eAAe,EAClC,oBAAoB,EACpB,IAAI,CACP,CAAA;~~wBACD~~,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;~~oBACvE~~,CAAC;~~gBACL~~,CAAC,CAAC,CAAA;~~gBACF~~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~~KAAK~~,EAAE,CAAA;~~oBACtD~~,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;gBACpD,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,qBAAqB,CAAC,eAAgC;QAClD,sDAAsD;QACtD,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CACtD,CAAC,kBAAsC,EAAE,EAAE,CAAC,kBAAkB,CAAC,eAAe,CAAC,GAAG,KAAK,eAAe,CAAC,GAAG,CAC7G,CAAA;IACL,CAAC;CACJ;~~AA1KD~~,~~sDA0KC~~"}
1	+ {"version":3,"file":"JavaDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/JavaDependencyHandler.ts"],"names":[],"mappings":"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"}

package/out/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandler.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import { Logging, Workspace, WorkspaceFolder } from '@aws/language-server-runtimes/server-interface';
-import * as fs from 'fs';
 import { ArtifactManager, FileMetadata } from '../../artifactManager';
 import { EventEmitter } from 'events';
 import { CodewhispererLanguage } from '../../../../shared/languageDetection';
+import { DependencyWatcher } from './DependencyWatcher';
 export interface Dependency {
     name: string;
     version: string;
@@ -20,14 +20,16 @@ export declare abstract class LanguageDependencyHandler<T extends BaseDependency
     protected logging: Logging;
     protected workspaceFolders: WorkspaceFolder[];
     protected dependencyMap: Map<WorkspaceFolder, Map<string, Dependency>>;
-    protected dependencyUploadedSize: Map<WorkspaceFolder, number>;
-    protected dependencyWatchers: Map<string, fs.FSWatcher>;
+    protected dependencyUploadedSizeMap: Map<WorkspaceFolder, number>;
+    protected dependencyUploadedSizeSum: Uint32Array<SharedArrayBuffer>;
+    protected dependencyWatchers: Map<string, DependencyWatcher>;
     protected artifactManager: ArtifactManager;
     protected dependenciesFolderName: string;
     protected eventEmitter: EventEmitter;
     protected readonly MAX_SINGLE_DEPENDENCY_SIZE: number;
     protected readonly MAX_WORKSPACE_DEPENDENCY_SIZE: number;
-    constructor(language: CodewhispererLanguage, workspace: Workspace, logging: Logging, workspaceFolders: WorkspaceFolder[], artifactManager: ArtifactManager, dependenciesFolderName: string);
+    protected readonly DEPENDENCY_WATCHER_EVENT_BATCH_INTERVAL: number;
+    constructor(language: CodewhispererLanguage, workspace: Workspace, logging: Logging, workspaceFolders: WorkspaceFolder[], artifactManager: ArtifactManager, dependenciesFolderName: string, dependencyUploadedSizeSum: Uint32Array<SharedArrayBuffer>);
     abstract discover(currentDir: string, workspaceFolder: WorkspaceFolder): boolean;
     abstract initiateDependencyMap(folders: WorkspaceFolder[]): void;
     abstract setupWatchers(folders: WorkspaceFolder[]): void;
@@ -38,7 +40,7 @@ export declare abstract class LanguageDependencyHandler<T extends BaseDependency
      * @param dependencyMap
      */
     protected abstract transformPathToDependency(dependencyName: string, dependencyPath: string, dependencyMap: Map<string, Dependency>): void;
-    onDependencyChange(callback: (workspaceFolder: WorkspaceFolder, zips: FileMetadata[]) => void): void;
+    onDependencyChange(callback: (workspaceFolder: WorkspaceFolder, zips: FileMetadata[], addWSFolderPathInS3: boolean) => void): void;
     protected emitDependencyChange(workspaceFolder: WorkspaceFolder, zips: FileMetadata[]): void;
     /**
      * Update dependency map based on didChangeDependencyPaths LSP. Javascript and Typescript will not use LSP so no need to implement this method

package/out/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandler.js CHANGED Viewed

@@ -4,6 +4,7 @@ exports.LanguageDependencyHandler = void 0;
 const fs = require("fs");
 const path = require("path");
 const events_1 = require("events");
+const util_1 = require("../../util");
 // Abstract base class for all language dependency handlers
 class LanguageDependencyHandler {
     language;
@@ -12,14 +13,16 @@ class LanguageDependencyHandler {
     workspaceFolders;
     // key: workspaceFolder, value: {key: dependency name, value: Dependency}
     dependencyMap = new Map();
-    dependencyUploadedSize = new Map();
+    dependencyUploadedSizeMap = new Map();
+    dependencyUploadedSizeSum;
     dependencyWatchers = new Map();
     artifactManager;
     dependenciesFolderName;
     eventEmitter;
     MAX_SINGLE_DEPENDENCY_SIZE = 500 * 1024 * 1024; // 500 MB
-    MAX_WORKSPACE_DEPENDENCY_SIZE = 5 * 1024 * 1024 * 1024; //5 GB
-    constructor(language, workspace, logging, workspaceFolders, artifactManager, dependenciesFolderName) {
+    MAX_WORKSPACE_DEPENDENCY_SIZE = 8 * 1024 * 1024 * 1024; // 8 GB
+    DEPENDENCY_WATCHER_EVENT_BATCH_INTERVAL = 1000;
+    constructor(language, workspace, logging, workspaceFolders, artifactManager, dependenciesFolderName, dependencyUploadedSizeSum) {
         this.language = language;
         this.workspace = workspace;
         this.logging = logging;
@@ -30,6 +33,7 @@ class LanguageDependencyHandler {
         // regardless of knowing whether the workspaceFolder has the language
         // to resolve the race condition when didChangeDependencyPaths LSP and dependency discover may override the dependency map.
         this.workspaceFolders.forEach(workSpaceFolder => this.dependencyMap.set(workSpaceFolder, new Map()));
+        this.dependencyUploadedSizeSum = dependencyUploadedSizeSum;
         this.eventEmitter = new events_1.EventEmitter();
     }
     onDependencyChange(callback) {
@@ -38,7 +42,9 @@ class LanguageDependencyHandler {
     emitDependencyChange(workspaceFolder, zips) {
         if (zips.length > 0) {
             this.logging.log(`Emitting ${this.language} dependency change event for ${workspaceFolder.name}`);
-            this.eventEmitter.emit('dependencyChange', workspaceFolder, zips);
+            // If language is JavaScript or TypeScript, we want to preserve the workspaceFolder path in S3 path
+            const addWSFolderPathInS3 = this.language === 'javascript' || this.language === 'typescript';
+            this.eventEmitter.emit('dependencyChange', workspaceFolder, zips, addWSFolderPathInS3);
             return;
         }
     }
@@ -103,7 +109,8 @@ class LanguageDependencyHandler {
                 }
                 currentChunk.push(dependency);
                 currentChunkSize += dependency.size;
-                this.dependencyUploadedSize.set(workspaceFolder, (this.dependencyUploadedSize.get(workspaceFolder) || 0) + dependency.size);
+                this.dependencyUploadedSizeMap.set(workspaceFolder, (this.dependencyUploadedSizeMap.get(workspaceFolder) || 0) + dependency.size);
+                Atomics.add(this.dependencyUploadedSizeSum, 0, dependency.size);
                 // Mark this dependency that has been zipped
                 dependency.zipped = true;
                 this.dependencyMap.get(workspaceFolder)?.set(dependency.name, dependency);
@@ -194,7 +201,7 @@ class LanguageDependencyHandler {
      * However, everytime flare server restarts, this dependency map will be initialized.
      */
     validateWorkspaceDependencySize(workspaceFolder) {
-        let uploadedSize = this.dependencyUploadedSize.get(workspaceFolder);
+        let uploadedSize = Atomics.load(this.dependencyUploadedSizeSum, 0);
         if (uploadedSize && this.MAX_WORKSPACE_DEPENDENCY_SIZE < uploadedSize) {
             return false;
         }
@@ -202,30 +209,29 @@ class LanguageDependencyHandler {
     }
     dispose() {
         this.dependencyMap.clear();
-        this.dependencyUploadedSize.clear();
-        this.dependencyWatchers.forEach(watcher => watcher.close());
+        this.dependencyUploadedSizeMap.clear();
+        this.dependencyWatchers.forEach(watcher => watcher.dispose());
         this.dependencyWatchers.clear();
     }
     disposeWorkspaceFolder(workspaceFolder) {
         this.dependencyMap.delete(workspaceFolder);
-        this.dependencyUploadedSize.delete(workspaceFolder);
+        Atomics.sub(this.dependencyUploadedSizeSum, 0, this.dependencyUploadedSizeMap.get(workspaceFolder) || 0);
+        this.dependencyUploadedSizeMap.delete(workspaceFolder);
         this.disposeWatchers(workspaceFolder);
         this.disposeDependencyInfo(workspaceFolder);
     }
     // For synchronous version if needed:
     getDirectorySize(directoryPath) {
+        if (!(0, util_1.isDirectory)(directoryPath)) {
+            return fs.statSync(directoryPath).size;
+        }
         let totalSize = 0;
         try {
             const files = fs.readdirSync(directoryPath);
             for (const file of files) {
                 const filePath = path.join(directoryPath, file);
                 const stats = fs.statSync(filePath);
-                if (stats.isDirectory()) {
-                    totalSize += this.getDirectorySize(filePath);
-                }
-                else {
-                    totalSize += stats.size;
-                }
+                totalSize += this.getDirectorySize(filePath);
             }
             return totalSize;
         }

package/out/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"LanguageDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandler.ts"],"names":[],"mappings":";;;AACA,yBAAwB;AAExB,6BAA6B;AAC7B,mCAAqC;~~AAgBrC~~,2DAA2D;AAC3D,MAAsB,yBAAyB;IACpC,QAAQ,CAAuB;IAC5B,SAAS,CAAW;IACpB,OAAO,CAAS;IAChB,gBAAgB,CAAmB;IAC7C,yEAAyE;IAC/D,aAAa,GAAG,IAAI,GAAG,EAA4C,CAAA;IACnE,~~sBAAsB~~,GAAG,IAAI,GAAG,EAA2B,CAAA;~~IAC3D~~,kBAAkB,~~GAA8B~~,IAAI,GAAG,~~EAAwB~~,CAAA;~~IAC/E~~,eAAe,CAAiB;IAChC,sBAAsB,CAAQ;IAC9B,YAAY,CAAc;IACjB,0BAA0B,GAAW,GAAG,GAAG,IAAI,GAAG,IAAI,CAAA,CAAC,SAAS;IAChE,6BAA6B,GAAW,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA,CAAC,~~MAAM~~;~~IAExF~~,YACI,QAA+B,EAC/B,SAAoB,EACpB,OAAgB,EAChB,gBAAmC,EACnC,eAAgC,EAChC,sBAA8B;~~QAE9B~~,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAA;QACpD,iGAAiG;QACjG,qEAAqE;QACrE,2HAA2H;QAC3H,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAC5C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,GAAG,EAAsB,CAAC,CACzE,CAAA;~~QAED~~,IAAI,CAAC,YAAY,GAAG,IAAI,qBAAY,EAAE,CAAA;IAC1C,CAAC;IA6BM,kBAAkB,~~CAAC~~,~~QAA0E~~;~~QAChG~~,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;IACtD,CAAC;IAES,oBAAoB,CAAC,eAAgC,EAAE,IAAoB;QACjF,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,QAAQ,gCAAgC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAA;YACjG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,EAAE,eAAe,EAAE,IAAI,CAAC,CAAA;~~YACjE~~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~~sBAAsB~~,CAAC,GAAG,~~CAC3B~~,eAAe,EACf,CAAC,IAAI,CAAC,~~sBAAsB~~,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,~~CAC5E~~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~~IAAI~~,CAAC,~~sBAAsB~~,CAAC,~~GAAG~~,CAAC,~~eAAe~~,CAAC,CAAA;~~QACnE~~,IAAI,YAAY,IAAI,IAAI,CAAC,6BAA6B,GAAG,YAAY,EAAE,CAAC;YACpE,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;IAED,OAAO;QACH,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAA;QAC1B,IAAI,CAAC,~~sBAAsB~~,CAAC,KAAK,EAAE,CAAA;~~QACnC~~,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,~~KAAK~~,EAAE,CAAC,CAAA;~~QAC3D~~,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAA;IACnC,CAAC;IAED,sBAAsB,CAAC,eAAgC;QACnD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;QAC1C,IAAI,CAAC,~~sBAAsB~~,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;~~QACnD~~,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAA;QACrC,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAA;IAC/C,CAAC;IAWD,qCAAqC;IAC3B,gBAAgB,CAAC,aAAqB;QAC5C,IAAI,SAAS,GAAG,CAAC,CAAA;QACjB,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;YAE3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;gBAC/C,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;~~gBAEnC~~,~~IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;oBACtB,~~SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;~~gBAChD~~,CAAC;~~qBAAM,CAAC;oBACJ,SAAS,IAAI,KAAK,CAAC,IAAI,CAAA;gBAC3B,CAAC;YACL,CAAC;~~YAED,OAAO,SAAS,CAAA;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAA;QACjE,CAAC;IACL,CAAC;IAES,kBAAkB,CAAC,cAAsB,EAAE,eAAgC;QACjF,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAC/E,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,eAA+B;QACxD,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;YAChC,IAAI,CAAC;gBACD,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC9B,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;oBAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAA;gBACzD,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,gEAAgE;gBAChE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,2BAA2B,GAAG,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC,CAAA;YAC1E,CAAC;QACL,CAAC;IACL,CAAC;CACJ;~~AA9VD~~,~~8DA8VC~~"}
1	+ {"version":3,"file":"LanguageDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandler.ts"],"names":[],"mappings":"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"}

package/out/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandlerFactory.d.ts CHANGED Viewed

@@ -3,5 +3,5 @@ import { Logging, Workspace, WorkspaceFolder } from '@aws/language-server-runtim
 import { ArtifactManager } from '../../artifactManager';
 import { CodewhispererLanguage } from '../../../../shared/languageDetection';
 export declare class DependencyHandlerFactory {
-    static createHandler(language: CodewhispererLanguage, workspace: Workspace, logging: Logging, workspaceFolders: WorkspaceFolder[], artifactManager: ArtifactManager): LanguageDependencyHandler<BaseDependencyInfo> | null;
+    static createHandler(language: CodewhispererLanguage, workspace: Workspace, logging: Logging, workspaceFolders: WorkspaceFolder[], artifactManager: ArtifactManager, dependencyUploadedSizeSum: Uint32Array<SharedArrayBuffer>): LanguageDependencyHandler<BaseDependencyInfo> | null;
 }

package/out/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandlerFactory.js CHANGED Viewed

@@ -5,15 +5,15 @@ const JavaDependencyHandler_1 = require("./JavaDependencyHandler");
 const PythonDependencyHandler_1 = require("./PythonDependencyHandler");
 const JSTSDependencyHandler_1 = require("./JSTSDependencyHandler");
 class DependencyHandlerFactory {
-    static createHandler(language, workspace, logging, workspaceFolders, artifactManager) {
+    static createHandler(language, workspace, logging, workspaceFolders, artifactManager, dependencyUploadedSizeSum) {
         switch (language.toLowerCase()) {
             case 'python':
-                return new PythonDependencyHandler_1.PythonDependencyHandler(language, workspace, logging, workspaceFolders, artifactManager, 'site-packages');
+                return new PythonDependencyHandler_1.PythonDependencyHandler(language, workspace, logging, workspaceFolders, artifactManager, 'site-packages', dependencyUploadedSizeSum);
             case 'javascript':
             case 'typescript':
-                return new JSTSDependencyHandler_1.JSTSDependencyHandler(language, workspace, logging, workspaceFolders, artifactManager, 'node_modules');
+                return new JSTSDependencyHandler_1.JSTSDependencyHandler(language, workspace, logging, workspaceFolders, artifactManager, 'node_modules', dependencyUploadedSizeSum);
             case 'java':
-                return new JavaDependencyHandler_1.JavaDependencyHandler(language, workspace, logging, workspaceFolders, artifactManager, 'dependencies');
+                return new JavaDependencyHandler_1.JavaDependencyHandler(language, workspace, logging, workspaceFolders, artifactManager, 'dependencies', dependencyUploadedSizeSum);
             default:
                 return null;
         }

package/out/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandlerFactory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"LanguageDependencyHandlerFactory.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandlerFactory.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAC/D,uEAAmE;AACnE,mEAA+D;AAM/D,MAAa,wBAAwB;IACjC,MAAM,CAAC,aAAa,CAChB,QAA+B,EAC/B,SAAoB,EACpB,OAAgB,EAChB,gBAAmC,EACnC,eAAgC;~~QAEhC~~,QAAQ,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7B,KAAK,QAAQ;gBACT,OAAO,IAAI,iDAAuB,CAC9B,QAAQ,EACR,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,eAAe,~~CAClB~~,CAAA;YACL,KAAK,YAAY,CAAC;YAClB,KAAK,YAAY;gBACb,OAAO,IAAI,6CAAqB,CAC5B,QAAQ,EACR,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,cAAc,~~CACjB~~,CAAA;YACL,KAAK,MAAM;gBACP,OAAO,IAAI,6CAAqB,CAC5B,QAAQ,EACR,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,cAAc,~~CACjB~~,CAAA;YACL;gBACI,OAAO,IAAI,CAAA;QACnB,CAAC;IACL,CAAC;CACJ;~~AAzCD~~,~~4DAyCC~~"}
1	+ {"version":3,"file":"LanguageDependencyHandlerFactory.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandlerFactory.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAC/D,uEAAmE;AACnE,mEAA+D;AAM/D,MAAa,wBAAwB;IACjC,MAAM,CAAC,aAAa,CAChB,QAA+B,EAC/B,SAAoB,EACpB,OAAgB,EAChB,gBAAmC,EACnC,eAAgC,EAChC,yBAAyD;QAEzD,QAAQ,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7B,KAAK,QAAQ;gBACT,OAAO,IAAI,iDAAuB,CAC9B,QAAQ,EACR,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,yBAAyB,CAC5B,CAAA;YACL,KAAK,YAAY,CAAC;YAClB,KAAK,YAAY;gBACb,OAAO,IAAI,6CAAqB,CAC5B,QAAQ,EACR,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,yBAAyB,CAC5B,CAAA;YACL,KAAK,MAAM;gBACP,OAAO,IAAI,6CAAqB,CAC5B,QAAQ,EACR,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,yBAAyB,CAC5B,CAAA;YACL;gBACI,OAAO,IAAI,CAAA;QACnB,CAAC;IACL,CAAC;CACJ;AA7CD,4DA6CC"}

package/out/language-server/workspaceContext/dependency/dependencyHandler/PythonDependencyHandler.js CHANGED Viewed

@@ -5,6 +5,7 @@ const LanguageDependencyHandler_1 = require("./LanguageDependencyHandler");
 const path = require("path");
 const fs = require("fs");
 const util_1 = require("../../util");
+const DependencyWatcher_1 = require("./DependencyWatcher");
 /*
  * Python Dependency Handler
  *
@@ -96,24 +97,21 @@ class PythonDependencyHandler extends LanguageDependencyHandler_1.LanguageDepend
                 }
                 this.logging.log(`Setting up Python dependency watcher for ${sitePackagesPath}`);
                 try {
-                    const watcher = fs.watch(sitePackagesPath, { recursive: false }, async (eventType, fileName) => {
-                        if (!fileName)
-                            return;
-                        // Handle event types
-                        if (eventType === 'rename') {
-                            const updatedDependencyMap = new Map();
+                    const callBackDependencyUpdate = async (events) => {
+                        const updatedDependencyMap = new Map();
+                        for (const fileName of events) {
                             if (this.isMetadataDirectory(fileName)) {
                                 this.handleMetadataChange(sitePackagesPath, fileName, updatedDependencyMap);
                             }
                             else {
                                 this.handlePackageChange(sitePackagesPath, fileName, updatedDependencyMap);
                             }
-                            let zips = await this.compareAndUpdateDependencyMap(pythonDependencyInfo.workspaceFolder, updatedDependencyMap, true);
-                            this.emitDependencyChange(pythonDependencyInfo.workspaceFolder, zips);
                         }
-                    });
+                        let zips = await this.compareAndUpdateDependencyMap(pythonDependencyInfo.workspaceFolder, updatedDependencyMap, true);
+                        this.emitDependencyChange(pythonDependencyInfo.workspaceFolder, zips);
+                    }; // end of callback function
+                    const watcher = new DependencyWatcher_1.DependencyWatcher(sitePackagesPath, callBackDependencyUpdate, this.logging, this.DEPENDENCY_WATCHER_EVENT_BATCH_INTERVAL);
                     this.dependencyWatchers.set(sitePackagesPath, watcher);
-                    this.logging.log(`Started watching Python site-packages: ${sitePackagesPath}`);
                 }
                 catch (error) {
                     this.logging.warn(`Error setting up watcher for ${sitePackagesPath}: ${error}`);
@@ -135,7 +133,12 @@ class PythonDependencyHandler extends LanguageDependencyHandler_1.LanguageDepend
             const sitePackagesContent = fs.readdirSync(sitePackagesPath);
             for (const item of sitePackagesContent) {
                 const itemPath = path.join(sitePackagesPath, item);
-                this.transformPathToDependency(item, itemPath, dependencyMap);
+                try {
+                    this.transformPathToDependency(item, itemPath, dependencyMap);
+                }
+                catch (error) {
+                    this.logging.warn(`Error processing item ${item} in ${sitePackagesPath}: ${error}`);
+                }
             }
         }
         return dependencyMap;
@@ -145,22 +148,28 @@ class PythonDependencyHandler extends LanguageDependencyHandler_1.LanguageDepend
         if (this.isMetadataDirectory(dependencyPath)) {
             return;
         }
-        // Add to dependency map if not already present
-        if (!dependencyMap.has(dependencyName)) {
-            let dependencySize = 0;
-            if ((0, util_1.isDirectory)(dependencyPath)) {
-                dependencySize = this.getDirectorySize(dependencyPath);
-            }
-            else {
-                dependencySize = fs.statSync(dependencyPath).size;
+        try {
+            // Add to dependency map if not already present
+            if (!dependencyMap.has(dependencyName)) {
+                let dependencySize = 0;
+                let truePath = (0, util_1.resolveSymlink)(dependencyPath);
+                if ((0, util_1.isDirectory)(truePath)) {
+                    dependencySize = this.getDirectorySize(truePath);
+                }
+                else {
+                    dependencySize = fs.statSync(truePath).size;
+                }
+                dependencyMap.set(dependencyName, {
+                    name: dependencyName,
+                    version: 'unknown',
+                    path: truePath,
+                    size: dependencySize,
+                    zipped: false,
+                });
             }
-            dependencyMap.set(dependencyName, {
-                name: dependencyName,
-                version: 'unknown',
-                path: dependencyPath,
-                size: dependencySize,
-                zipped: false,
-            });
+        }
+        catch (error) {
+            this.logging.warn(`Error processing dependency ${dependencyName}: ${error}`);
         }
     }
     isMetadataDirectory(filename) {
@@ -171,7 +180,7 @@ class PythonDependencyHandler extends LanguageDependencyHandler_1.LanguageDepend
         // Example: 'requests-2.28.1.dist-info' -> 'requests'
         const dependencyName = metadataDir.split('-')[0];
         // Check if we have this package in our dependency map
-        const dependencyPath = path.join(sitePackagesPath, dependencyName);
+        const dependencyPath = (0, util_1.resolveSymlink)(path.join(sitePackagesPath, dependencyName));
         if (fs.existsSync(dependencyPath)) {
             // Mark the package as updated
             const updatedDependency = {
@@ -186,7 +195,7 @@ class PythonDependencyHandler extends LanguageDependencyHandler_1.LanguageDepend
         }
     }
     handlePackageChange(sitePackagesPath, fileName, updatedDependencyMap) {
-        const dependencyPath = path.join(sitePackagesPath, fileName);
+        const dependencyPath = (0, util_1.resolveSymlink)(path.join(sitePackagesPath, fileName));
         if (fs.existsSync(dependencyPath)) {
             const updatedDependency = {
                 name: fileName,
@@ -217,7 +226,7 @@ class PythonDependencyHandler extends LanguageDependencyHandler_1.LanguageDepend
                 pythonDependencyInfo.sitePackagesPaths.forEach((sitePackagesPath) => {
                     if (this.dependencyWatchers.has(sitePackagesPath)) {
                         this.logging.log(`Disposing dependency watcher for ${sitePackagesPath}`);
-                        this.dependencyWatchers.get(sitePackagesPath)?.close();
+                        this.dependencyWatchers.get(sitePackagesPath)?.dispose();
                         this.dependencyWatchers.delete(sitePackagesPath);
                     }
                 });

package/out/language-server/workspaceContext/dependency/dependencyHandler/PythonDependencyHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PythonDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/PythonDependencyHandler.ts"],"names":[],"mappings":";;;AAAA,2EAAuG;AAEvG,6BAA4B;AAC5B,yBAAwB;AAExB,~~qCAAwC~~;~~AAOxC~~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~~OAAO~~,GAAG,~~EAAE,CAAC,~~KAAK,~~CAAC,gBAAgB,~~EAAE,~~EAAE~~,~~SAAS,~~EAAE,~~KAAK,~~EAAE,~~EAAE~~,~~KAAK~~,~~EAAE~~,~~SAAS~~,~~EAAE~~,~~QAAQ~~,~~EAAE,EAAE~~;~~wBAC3F~~,~~IAAI~~,~~CAAC~~,QAAQ~~;4BAAE~~,~~OAAM;wBACrB,qBAAqB;wBACrB,~~IAAI,~~SAAS~~,~~KAAK,QAAQ,~~EAAE,CAAC;~~4BACzB~~,~~MAAM,oBAAoB,GAA4B,~~IAAI,~~GAAG,EAAsB,CAAA;4BACnF,~~IAAI,~~IAAI,~~CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,CAAC;gCACrC,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAA;4BAC/E,CAAC;iCAAM,CAAC;gCACJ,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAA;4BAC9E,CAAC;~~4BACD~~,IAAI,IAAI,GAAmB,MAAM,IAAI,CAAC,6BAA6B,CAC/D,oBAAoB,CAAC,eAAe,EACpC,oBAAoB,EACpB,IAAI,CACP,CAAA;~~4BACD~~,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;~~wBACzE~~,CAAC~~;oBACL~~,~~CAAC~~,CAAC,~~CAAA~~;~~oBACF~~,~~IAAI~~,~~CAAC~~,~~kBAAkB~~,~~CAAC~~,~~GAAG~~,~~CAAC~~,gBAAgB,~~EAAE~~,OAAO,CAAC,CAAA;~~oBACtD~~,IAAI,CAAC,~~OAAO~~,CAAC,GAAG,CAAC,~~0CAA0C,~~gBAAgB,EAAE,CAAC,CAAA;~~gBAClF~~,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gCAAgC,gBAAgB,KAAK,KAAK,EAAE,CAAC,CAAA;gBACnF,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;;;;OAMG;IACH,qBAAqB,CAAC,oBAA0C;QAC5D,MAAM,aAAa,GAAG,IAAI,GAAG,EAAsB,CAAA;QACnD,uCAAuC;QACvC,KAAK,MAAM,gBAAgB,IAAI,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;YACpE,MAAM,mBAAmB,GAAG,EAAE,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAA;YAE5D,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAA;~~gBAElD~~,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAA;~~YACjE~~,CAAC;QACL,CAAC;QACD,OAAO,aAAa,CAAA;IACxB,CAAC;IAED,yBAAyB,CACrB,cAAsB,EACtB,cAAsB,EACtB,aAAsC;QAEtC,oCAAoC;QACpC,IAAI,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,EAAE,CAAC;YAC3C,OAAM;QACV,CAAC;QAED,+CAA+C;~~QAC~~/C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;~~YACrC~~,IAAI,cAAc,GAAW,CAAC,CAAA;~~YAC9B~~,IAAI,IAAA,~~kBAAW~~,EAAC,cAAc,CAAC,EAAE,CAAC;~~gBAC9B~~,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,~~cAAc~~,CAAC,CAAA;~~YAC1D~~,CAAC;~~iBAAM~~,CAAC;~~gBACJ~~,cAAc,GAAG,EAAE,CAAC,QAAQ,CAAC,~~cAAc~~,CAAC,CAAC,IAAI,CAAA;~~YACrD~~,CAAC;~~YACD~~,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE;~~gBAC9B~~,IAAI,EAAE,cAAc;~~gBACpB~~,OAAO,EAAE,SAAS;~~gBAClB~~,IAAI,EAAE,~~cAAc~~;~~gBACpB~~,IAAI,EAAE,cAAc;~~gBACpB~~,MAAM,EAAE,KAAK;~~aAChB~~,CAAC,CAAA;~~QACN~~,CAAC;IACL,CAAC;IAEO,mBAAmB,CAAC,QAAgB;QACxC,OAAO,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC1G,CAAC;IAEO,oBAAoB,CACxB,gBAAwB,EACxB,WAAmB,EACnB,oBAA6C;QAE7C,oDAAoD;QACpD,qDAAqD;QACrD,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAEhD,sDAAsD;QACtD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;~~QAClE~~,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YAChC,8BAA8B;YAC9B,MAAM,iBAAiB,GAAG;gBACtB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,SAAS;gBAClB,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC;gBAC3C,MAAM,EAAE,KAAK;aAChB,CAAA;YACD,oBAAoB,CAAC,GAAG,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAA;YAC3D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,6CAA6C,cAAc,EAAE,CAAC,CAAA;QACnF,CAAC;IACL,CAAC;IAEO,mBAAmB,CACvB,gBAAwB,EACxB,QAAgB,EAChB,oBAA6C;QAE7C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;~~QAC5D~~,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YAChC,MAAM,iBAAiB,GAAG;gBACtB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,SAAS;gBAClB,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC;gBAC3C,MAAM,EAAE,KAAK;aAChB,CAAA;YACD,oBAAoB,CAAC,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAA;YACrD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,QAAQ,EAAE,CAAC,CAAA;QAC3D,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,OAAe,EAAE,eAAuB;QACxD,+CAA+C;QAC/C,OAAO,OAAO;aACT,OAAO,CAAC,sBAAsB,EAAE,eAAe,CAAC;aAChD,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;aACrE,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;IACpF,CAAC;IAEO,qBAAqB,CAAC,WAAqB;QAC/C,wCAAwC;QACxC,MAAM,eAAe,GAAG,IAAI,GAAG,CAC3B,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CACvG,CAAA;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;IACtC,CAAC;IAED,eAAe,CAAC,eAAgC;QAC5C,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,oBAA0C,EAAE,EAAE;YAC9E,IAAI,eAAe,CAAC,GAAG,KAAK,oBAAoB,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;gBACnE,oBAAoB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,gBAAwB,EAAE,EAAE;oBACxE,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;wBAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oCAAoC,gBAAgB,EAAE,CAAC,CAAA;wBACxE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,~~KAAK~~,EAAE,CAAA;~~wBACtD~~,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;oBACpD,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,qBAAqB,CAAC,eAAgC;QAClD,sDAAsD;QACtD,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAC1D,CAAC,oBAA0C,EAAE,EAAE,CAC3C,oBAAoB,CAAC,eAAe,CAAC,GAAG,KAAK,eAAe,CAAC,GAAG,CACvE,CAAA;IACL,CAAC;CACJ;~~AArQD~~,~~0DAqQC~~"}
1	+ {"version":3,"file":"PythonDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/PythonDependencyHandler.ts"],"names":[],"mappings":"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"}

package/out/language-server/workspaceContext/javaManager.js CHANGED Viewed

@@ -658,7 +658,7 @@ class EclipseConfigGenerator {
             for (const fileName of eclipseFiles) {
                 const pattern = path.join(this.workspacePath, '**', fileName);
                 const files = await glob(pattern, {
-                    ignore: IGNORE_PATTERNS,
+                    ignore: IGNORE_PATTERNS.filter(p => p !== '**/.*'),
                     onlyFiles: true,
                     followSymbolicLinks: false,
                     dot: true,