@aws/lsp-codewhisperer 0.0.65 → 0.0.67
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.
- package/CHANGELOG.md +56 -0
- package/README.md +5 -0
- package/out/language-server/agenticChat/agenticChatController.d.ts +9 -2
- package/out/language-server/agenticChat/agenticChatController.js +512 -136
- package/out/language-server/agenticChat/agenticChatController.js.map +1 -1
- package/out/language-server/agenticChat/constants/constants.d.ts +17 -0
- package/out/language-server/agenticChat/constants/constants.js +79 -1
- package/out/language-server/agenticChat/constants/constants.js.map +1 -1
- package/out/language-server/agenticChat/constants/toolConstants.d.ts +24 -0
- package/out/language-server/agenticChat/constants/toolConstants.js +35 -0
- package/out/language-server/agenticChat/constants/toolConstants.js.map +1 -0
- package/out/language-server/agenticChat/context/additionalContextProvider.d.ts +9 -1
- package/out/language-server/agenticChat/context/additionalContextProvider.js +92 -34
- package/out/language-server/agenticChat/context/additionalContextProvider.js.map +1 -1
- package/out/language-server/agenticChat/context/agenticChatTriggerContext.d.ts +11 -2
- package/out/language-server/agenticChat/context/agenticChatTriggerContext.js +36 -2
- package/out/language-server/agenticChat/context/agenticChatTriggerContext.js.map +1 -1
- package/out/language-server/agenticChat/context/contextCommandsProvider.js +1 -1
- package/out/language-server/agenticChat/context/contextCommandsProvider.js.map +1 -1
- package/out/language-server/agenticChat/context/contextUtils.d.ts +16 -0
- package/out/language-server/agenticChat/context/contextUtils.js +29 -0
- package/out/language-server/agenticChat/context/contextUtils.js.map +1 -1
- package/out/language-server/agenticChat/qAgenticChatServer.d.ts +2 -0
- package/out/language-server/agenticChat/qAgenticChatServer.js +18 -2
- package/out/language-server/agenticChat/qAgenticChatServer.js.map +1 -1
- package/out/language-server/agenticChat/tools/chatDb/chatDb.d.ts +11 -3
- package/out/language-server/agenticChat/tools/chatDb/chatDb.js +115 -31
- package/out/language-server/agenticChat/tools/chatDb/chatDb.js.map +1 -1
- package/out/language-server/agenticChat/tools/chatDb/util.d.ts +15 -1
- package/out/language-server/agenticChat/tools/chatDb/util.js +17 -0
- package/out/language-server/agenticChat/tools/chatDb/util.js.map +1 -1
- package/out/language-server/agenticChat/tools/executeBash.d.ts +0 -11
- package/out/language-server/agenticChat/tools/executeBash.js +16 -35
- package/out/language-server/agenticChat/tools/executeBash.js.map +1 -1
- package/out/language-server/agenticChat/tools/grepSearch.js +3 -1
- package/out/language-server/agenticChat/tools/grepSearch.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.js +208 -170
- package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpManager.d.ts +12 -18
- package/out/language-server/agenticChat/tools/mcp/mcpManager.js +353 -216
- package/out/language-server/agenticChat/tools/mcp/mcpManager.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpTypes.d.ts +29 -0
- package/out/language-server/agenticChat/tools/mcp/mcpTypes.js +60 -1
- package/out/language-server/agenticChat/tools/mcp/mcpTypes.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpUtils.d.ts +27 -4
- package/out/language-server/agenticChat/tools/mcp/mcpUtils.js +464 -2
- package/out/language-server/agenticChat/tools/mcp/mcpUtils.js.map +1 -1
- package/out/language-server/agenticChat/tools/toolServer.js +8 -10
- package/out/language-server/agenticChat/tools/toolServer.js.map +1 -1
- package/out/language-server/agenticChat/tools/toolShared.js +6 -2
- package/out/language-server/agenticChat/tools/toolShared.js.map +1 -1
- package/out/language-server/chat/chatController.d.ts +1 -1
- package/out/language-server/chat/chatController.js.map +1 -1
- package/out/language-server/chat/chatSessionService.d.ts +1 -0
- package/out/language-server/chat/chatSessionService.js +5 -2
- package/out/language-server/chat/chatSessionService.js.map +1 -1
- package/out/language-server/chat/contexts/triggerContext.js +11 -2
- package/out/language-server/chat/contexts/triggerContext.js.map +1 -1
- package/out/language-server/chat/quickActions.d.ts +7 -1
- package/out/language-server/chat/quickActions.js +7 -1
- package/out/language-server/chat/quickActions.js.map +1 -1
- package/out/language-server/chat/telemetry/chatTelemetryController.d.ts +1 -0
- package/out/language-server/chat/telemetry/chatTelemetryController.js +9 -0
- package/out/language-server/chat/telemetry/chatTelemetryController.js.map +1 -1
- package/out/language-server/configuration/qConfigurationServer.d.ts +2 -0
- package/out/language-server/configuration/qConfigurationServer.js.map +1 -1
- package/out/language-server/inline-completion/auto-trigger/autoTrigger.d.ts +3 -0
- package/out/language-server/inline-completion/auto-trigger/autoTrigger.js +105 -1
- package/out/language-server/inline-completion/auto-trigger/autoTrigger.js.map +1 -1
- package/out/language-server/inline-completion/auto-trigger/editPredictionAutoTrigger.js +6 -1
- package/out/language-server/inline-completion/auto-trigger/editPredictionAutoTrigger.js.map +1 -1
- package/out/language-server/inline-completion/auto-trigger/editPredictionConfig.d.ts +1 -0
- package/out/language-server/inline-completion/auto-trigger/editPredictionConfig.js +1 -0
- package/out/language-server/inline-completion/auto-trigger/editPredictionConfig.js.map +1 -1
- package/out/language-server/inline-completion/codeWhispererServer.js +53 -52
- package/out/language-server/inline-completion/codeWhispererServer.js.map +1 -1
- package/out/language-server/workspaceContext/dependency/dependencyDiscoverer.d.ts +4 -1
- package/out/language-server/workspaceContext/dependency/dependencyDiscoverer.js +36 -2
- package/out/language-server/workspaceContext/dependency/dependencyDiscoverer.js.map +1 -1
- package/out/language-server/workspaceContext/dependency/dependencyEventBundler.d.ts +11 -5
- package/out/language-server/workspaceContext/dependency/dependencyEventBundler.js +37 -10
- package/out/language-server/workspaceContext/dependency/dependencyEventBundler.js.map +1 -1
- package/out/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.d.ts +1 -1
- package/out/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.js +8 -3
- package/out/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.js.map +1 -1
- package/out/language-server/workspaceContext/dependency/dependencyHandler/JavaDependencyHandler.js +3 -4
- package/out/language-server/workspaceContext/dependency/dependencyHandler/JavaDependencyHandler.js.map +1 -1
- package/out/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandler.d.ts +4 -3
- package/out/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandler.js +5 -9
- package/out/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandler.js.map +1 -1
- package/out/language-server/workspaceContext/dependency/dependencyHandler/PythonDependencyHandler.js +3 -4
- package/out/language-server/workspaceContext/dependency/dependencyHandler/PythonDependencyHandler.js.map +1 -1
- package/out/language-server/workspaceContext/workspaceContextServer.js +12 -8
- package/out/language-server/workspaceContext/workspaceContextServer.js.map +1 -1
- package/out/shared/activeUserTracker.d.ts +52 -0
- package/out/shared/activeUserTracker.js +164 -0
- package/out/shared/activeUserTracker.js.map +1 -0
- package/out/shared/amazonQServiceManager/configurationUtils.d.ts +4 -0
- package/out/shared/amazonQServiceManager/configurationUtils.js +6 -0
- package/out/shared/amazonQServiceManager/configurationUtils.js.map +1 -1
- package/out/shared/codeWhispererService.js +3 -1
- package/out/shared/codeWhispererService.js.map +1 -1
- package/out/shared/streamingClientService.js +12 -1
- package/out/shared/streamingClientService.js.map +1 -1
- package/out/shared/telemetry/telemetryService.js +1 -2
- package/out/shared/telemetry/telemetryService.js.map +1 -1
- package/out/shared/telemetry/types.d.ts +7 -1
- package/out/shared/telemetry/types.js +1 -0
- package/out/shared/telemetry/types.js.map +1 -1
- package/out/shared/utils.d.ts +1 -7
- package/out/shared/utils.js +39 -36
- package/out/shared/utils.js.map +1 -1
- package/package.json +7 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencyDiscoverer.js","sourceRoot":"","sources":["../../../../src/language-server/workspaceContext/dependency/dependencyDiscoverer.ts"],"names":[],"mappings":";;;AAAA,6BAA4B;AAC5B,yBAAwB;AAExB,2CAAgC;AAChC,2GAA+F;AAO/F,yEAAsF;
|
|
1
|
+
{"version":3,"file":"dependencyDiscoverer.js","sourceRoot":"","sources":["../../../../src/language-server/workspaceContext/dependency/dependencyDiscoverer.ts"],"names":[],"mappings":";;;AAAA,6BAA4B;AAC5B,yBAAwB;AAExB,2CAAgC;AAChC,2GAA+F;AAO/F,yEAAsF;AACtF,qEAAiE;AAEjE,MAAa,oBAAoB;IACrB,OAAO,CAAS;IAChB,gBAAgB,CAAmB;IACpC,yBAAyB,GAAoD,EAAE,CAAA;IAC9E,0BAA0B,GAAG,IAAI,GAAG,EAA4B,CAAA;IAChE,WAAW,GAAiC,EAAE,UAAU,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,EAAE,CAAA;IAC/F,kCAAkC,GAAG,IAAI,GAAG,EAAU,CAAA;IAE9D,YACI,SAAoB,EACpB,OAAgB,EAChB,gBAAmC,EACnC,eAAgC;QAEhC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QAEtB,IAAI,kBAAkB,GAAG,KAAK,CAAA;QAC9B,sDAAkC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAClD,MAAM,OAAO,GAAG,2DAAwB,CAAC,aAAa,CAClD,QAAQ,EACR,SAAS,EACT,OAAO,EACP,gBAAgB,EAChB,eAAe,EACf,IAAI,CAAC,WAAW,CACnB,CAAA;YACD,IAAI,OAAO,EAAE,CAAC;gBACV,8CAA8C;gBAC9C,IAAI,QAAQ,KAAK,YAAY,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;oBACzD,IAAI,CAAC,kBAAkB,EAAE,CAAC;wBACtB,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBAC5C,kBAAkB,GAAG,IAAI,CAAA;oBAC7B,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAChD,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,sBAAsB,CAAC,GAAW;QACtC,MAAM,gBAAgB,GAAG;YACrB,KAAK;YACL,gBAAgB;YAChB,QAAQ;YACR,SAAS;YACT,QAAQ;YACR,OAAO;YACP,OAAO;YACP,QAAQ;YACR,OAAO;SACV,CAAA;QAED,OAAO,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAC9D,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAA0B;QAC/C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAA;QAEvE,2EAA2E;QAC3E,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAA;QAE5C,KAAK,MAAM,eAAe,IAAI,OAAO,EAAE,CAAC;YACpC,IACI,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,eAAe,CAAC;gBACpD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,eAAe,CAAC,EACtD,CAAC;gBACC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kDAAkD,eAAe,CAAC,GAAG,EAAE,CAAC,CAAA;gBACzF,SAAQ;YACZ,CAAC;YACD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;YAC1D,MAAM,mBAAmB,GAAG,gBAAG,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;YAC/D,MAAM,KAAK,GAAqC,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;YAExF,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,EAAG,CAAA;gBACjD,IAAI,2BAA2B,GAAG,KAAK,CAAA;gBACvC,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;oBAC7D,IAAI,iBAAiB,CAAC,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,CAAC;wBAC1D,2BAA2B,GAAG,IAAI,CAAA;wBAClC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,iBAAiB,CAAC,QAAQ,kBAAkB,UAAU,EAAE,CAAC,CAAA;wBACnF,MAAK;oBACT,CAAC;gBACL,CAAC;gBACD,2CAA2C;gBAC3C,IAAI,2BAA2B,EAAE,CAAC;oBAC9B,SAAQ;gBACZ,CAAC;gBAED,IAAI,CAAC;oBACD,yCAAyC;oBACzC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;oBACpD,IAAI,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC;wBAC5B,SAAQ;oBACZ,CAAC;oBAED,oDAAoD;oBACpD,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;oBACxC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;wBACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;wBAC5C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA,CAAC,+CAA+C;wBAE/F,yBAAyB;wBACzB,IAAI,KAAK,CAAC,cAAc,EAAE,EAAE,CAAC;4BACzB,SAAQ;wBACZ,CAAC;wBAED,2DAA2D;wBAC3D,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,CAAC;4BAC5D,SAAQ;wBACZ,CAAC;wBAED,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAA;oBACnD,CAAC;gBACL,CAAC;gBAAC,OAAO,KAAU,EAAE,CAAC;oBAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,8CAA8C,UAAU,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBACnG,CAAC;YACL,CAAC;QACL,CAAC;QAED,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC7D,iBAAiB,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAA;YAChD,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YACxC,MAAM,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;QACrD,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;IAChE,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,OAA0B;QACnD,IAAI,CAAC,WAAW,CAAC,yBAAyB,GAAG,CAAC,CAAA;QAC9C,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC7D,iBAAiB,CAAC,6BAA6B,EAAE,CAAA;YACjD,MAAM,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;QACrD,CAAC;IACL,CAAC;IAEM,0BAA0B,CAAC,kBAA0B;QACxD,OAAO,IAAI,CAAC,kCAAkC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAC1E,CAAC;IAEO,8BAA8B,CAAC,gBAAmC;QACtE,IAAI,uBAAuB,GAAG,CAAC,CAAA;QAC/B,KAAK,MAAM,eAAe,IAAI,gBAAgB,EAAE,CAAC;YAC7C,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;gBAC7D,IAAI,CAAC;oBACD,MAAM,aAAa,GAAG,+CAAsB,CAAC,0BAA0B,CACnE,iBAAiB,CAAC,QAAQ,EAC1B,eAAe,CAAC,GAAG,CACtB,CAAA;oBACD,IAAI,CAAC,aAAa,EAAE,CAAC;wBACjB,SAAQ;oBACZ,CAAC;oBACD,iBAAiB,CAAC,6BAA6B,CAAC,aAAa,EAAE,eAAe,CAAC,CAAA;oBAC/E,uBAAuB,IAAI,aAAa,CAAC,MAAM,CAAA;gBACnD,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,yCAAyC,eAAe,CAAC,GAAG,KAAK,KAAK,EAAE,CAAC,CAAA;gBAChG,CAAC;YACL,CAAC;YACD,IAAI,CAAC,kCAAkC,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;QACpE,CAAC;QACD,IAAI,uBAAuB,GAAG,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,uBAAuB,oDAAoD,CAAC,CAAA;QAC7G,CAAC;IACL,CAAC;IAED,KAAK,CAAC,6BAA6B,CAAC,QAAgB,EAAE,KAAe,EAAE,MAAwB;QAC3F,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,OAAM;QACV,CAAC;QACD,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC7D,IAAI,iBAAiB,CAAC,QAAQ,IAAI,QAAQ,EAAE,CAAC;gBACzC,SAAQ;YACZ,CAAC;YACD,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,6BAA6B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;YAC5F,MAAM,iBAAiB,CAAC,+BAA+B,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAA;QAC1F,CAAC;IACL,CAAC;IAEM,iBAAiB;QACpB,IAAI,CAAC,WAAW,CAAC,UAAU,GAAG,KAAK,CAAA;QACnC,IAAI,CAAC,WAAW,CAAC,yBAAyB,GAAG,CAAC,CAAA;IAClD,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,0BAA0B,CAAC,KAAK,EAAE,CAAA;QACvC,IAAI,CAAC,kCAAkC,CAAC,KAAK,EAAE,CAAA;QAC/C,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YACvD,iBAAiB,CAAC,OAAO,EAAE,CAAA;QAC/B,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,CAAC,UAAU,GAAG,IAAI,CAAA;IACtC,CAAC;IAEM,sBAAsB,CAAC,eAAgC;QAC1D,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;QACvD,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YACvD,iBAAiB,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAA;QAC7D,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAvMD,oDAuMC"}
|
|
@@ -1,24 +1,30 @@
|
|
|
1
|
-
import { Logging
|
|
1
|
+
import { Logging } from '@aws/language-server-runtimes/server-interface';
|
|
2
2
|
import { DependencyDiscoverer } from './dependencyDiscoverer';
|
|
3
|
+
import { WorkspaceFolderManager } from '../workspaceFolderManager';
|
|
3
4
|
export interface DependencyEvent {
|
|
4
5
|
language: string;
|
|
5
6
|
paths: string[];
|
|
6
|
-
|
|
7
|
+
workspaceFolderUri: string;
|
|
7
8
|
}
|
|
8
9
|
export declare class DependencyEventBundler {
|
|
10
|
+
private static readonly recordedDependencies;
|
|
9
11
|
private readonly logging;
|
|
10
12
|
private readonly dependencyDiscoverer;
|
|
13
|
+
private readonly workspaceFolderManager;
|
|
11
14
|
private readonly BUNDLER_PROCESS_INTERVAL;
|
|
12
|
-
|
|
15
|
+
private eventSendingQueue;
|
|
13
16
|
private eventBundlerInterval;
|
|
14
17
|
private isBundlerWorking;
|
|
15
|
-
constructor(logging: Logging, dependencyDiscoverer: DependencyDiscoverer);
|
|
18
|
+
constructor(logging: Logging, dependencyDiscoverer: DependencyDiscoverer, workspaceFolderManager: WorkspaceFolderManager);
|
|
16
19
|
/**
|
|
17
20
|
* Starts the dependency event bundler that processes the eventQueue every 500ms.
|
|
18
21
|
* Skips execution if previous work hasn't finished to prevent concurrent processing.
|
|
19
22
|
* Groups events by language and workspaceFolder, then processes them as batches.
|
|
20
23
|
*/
|
|
21
24
|
startDependencyEventBundler(): void;
|
|
22
|
-
|
|
25
|
+
sendDependencyEvent(event: DependencyEvent): void;
|
|
23
26
|
dispose(): void;
|
|
27
|
+
private static getBundleKey;
|
|
28
|
+
static recordDependencyEvent(event: DependencyEvent): void;
|
|
29
|
+
static getRecordedDependencyPaths(language: string, workspaceFolderUri: string): string[] | undefined;
|
|
24
30
|
}
|
|
@@ -2,15 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DependencyEventBundler = void 0;
|
|
4
4
|
class DependencyEventBundler {
|
|
5
|
+
// Map storing historically received dependency events from extension
|
|
6
|
+
// Key is <language>-<workspaceFolderUri> and value is a set of paths
|
|
7
|
+
static recordedDependencies = new Map();
|
|
5
8
|
logging;
|
|
6
9
|
dependencyDiscoverer;
|
|
10
|
+
workspaceFolderManager;
|
|
7
11
|
BUNDLER_PROCESS_INTERVAL = 500; // 500 milliseconds
|
|
8
|
-
|
|
12
|
+
eventSendingQueue = [];
|
|
9
13
|
eventBundlerInterval;
|
|
10
14
|
isBundlerWorking = false;
|
|
11
|
-
constructor(logging, dependencyDiscoverer) {
|
|
15
|
+
constructor(logging, dependencyDiscoverer, workspaceFolderManager) {
|
|
12
16
|
this.logging = logging;
|
|
13
17
|
this.dependencyDiscoverer = dependencyDiscoverer;
|
|
18
|
+
this.workspaceFolderManager = workspaceFolderManager;
|
|
14
19
|
}
|
|
15
20
|
/**
|
|
16
21
|
* Starts the dependency event bundler that processes the eventQueue every 500ms.
|
|
@@ -24,10 +29,10 @@ class DependencyEventBundler {
|
|
|
24
29
|
}
|
|
25
30
|
this.isBundlerWorking = true;
|
|
26
31
|
try {
|
|
27
|
-
const allEvents = this.
|
|
32
|
+
const allEvents = this.eventSendingQueue.splice(0);
|
|
28
33
|
// Form bundles based on unique combination of language and workspaceFolder
|
|
29
34
|
const dependencyEventBundles = allEvents.reduce((accumulator, event) => {
|
|
30
|
-
const key =
|
|
35
|
+
const key = DependencyEventBundler.getBundleKey(event.language, event.workspaceFolderUri);
|
|
31
36
|
if (!accumulator.has(key)) {
|
|
32
37
|
accumulator.set(key, []);
|
|
33
38
|
}
|
|
@@ -36,7 +41,9 @@ class DependencyEventBundler {
|
|
|
36
41
|
}, new Map());
|
|
37
42
|
// Process bundles one by one, concatenating all the paths within the bundle
|
|
38
43
|
for (const [bundleKey, bundledEvents] of dependencyEventBundles) {
|
|
39
|
-
|
|
44
|
+
const { language, workspaceFolderUri } = bundledEvents[0];
|
|
45
|
+
const workspaceFolder = this.workspaceFolderManager.getWorkspaceFolder(workspaceFolderUri);
|
|
46
|
+
await this.dependencyDiscoverer.handleDependencyUpdateFromLSP(language, bundledEvents.flatMap(event => event.paths), workspaceFolder);
|
|
40
47
|
}
|
|
41
48
|
}
|
|
42
49
|
catch (err) {
|
|
@@ -47,16 +54,36 @@ class DependencyEventBundler {
|
|
|
47
54
|
}
|
|
48
55
|
}, this.BUNDLER_PROCESS_INTERVAL);
|
|
49
56
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return `${event.language}-undefined`;
|
|
53
|
-
}
|
|
54
|
-
return `${event.language}-${event.workspaceFolder.uri}`;
|
|
57
|
+
sendDependencyEvent(event) {
|
|
58
|
+
this.eventSendingQueue.push(event);
|
|
55
59
|
}
|
|
56
60
|
dispose() {
|
|
57
61
|
if (this.eventBundlerInterval) {
|
|
58
62
|
clearInterval(this.eventBundlerInterval);
|
|
59
63
|
}
|
|
64
|
+
this.eventSendingQueue = [];
|
|
65
|
+
}
|
|
66
|
+
static getBundleKey(language, workspaceFolderUri) {
|
|
67
|
+
return `${language}-${workspaceFolderUri}`;
|
|
68
|
+
}
|
|
69
|
+
static recordDependencyEvent(event) {
|
|
70
|
+
const key = this.getBundleKey(event.language, event.workspaceFolderUri);
|
|
71
|
+
if (!this.recordedDependencies.has(key)) {
|
|
72
|
+
this.recordedDependencies.set(key, new Set());
|
|
73
|
+
}
|
|
74
|
+
const receivedPaths = this.recordedDependencies.get(key);
|
|
75
|
+
if (receivedPaths) {
|
|
76
|
+
event.paths.forEach(path => {
|
|
77
|
+
receivedPaths.add(path);
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
static getRecordedDependencyPaths(language, workspaceFolderUri) {
|
|
82
|
+
const key = this.getBundleKey(language, workspaceFolderUri);
|
|
83
|
+
const receivedPaths = this.recordedDependencies.get(key);
|
|
84
|
+
if (receivedPaths) {
|
|
85
|
+
return Array.from(receivedPaths);
|
|
86
|
+
}
|
|
60
87
|
}
|
|
61
88
|
}
|
|
62
89
|
exports.DependencyEventBundler = DependencyEventBundler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencyEventBundler.js","sourceRoot":"","sources":["../../../../src/language-server/workspaceContext/dependency/dependencyEventBundler.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"dependencyEventBundler.js","sourceRoot":"","sources":["../../../../src/language-server/workspaceContext/dependency/dependencyEventBundler.ts"],"names":[],"mappings":"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"}
|
package/out/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export declare class JSTSDependencyHandler extends LanguageDependencyHandler<JST
|
|
|
10
10
|
initiateDependencyMap(folders: WorkspaceFolder[]): void;
|
|
11
11
|
generateDependencyMap(jstsDependencyInfo: JSTSDependencyInfo): Map<string, Dependency>;
|
|
12
12
|
setupWatchers(folders: WorkspaceFolder[]): void;
|
|
13
|
-
updateDependencyMapBasedOnLSP(paths: string[], workspaceFolder?: WorkspaceFolder):
|
|
13
|
+
updateDependencyMapBasedOnLSP(paths: string[], workspaceFolder?: WorkspaceFolder): Dependency[];
|
|
14
14
|
transformPathToDependency(dependencyName: string, dependencyPath: string, dependencyMap: Map<string, Dependency>): void;
|
|
15
15
|
disposeWatchers(workspaceFolder: WorkspaceFolder): void;
|
|
16
16
|
disposeDependencyInfo(workspaceFolder: WorkspaceFolder): void;
|
package/out/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.js
CHANGED
|
@@ -93,7 +93,8 @@ class JSTSDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
|
|
|
93
93
|
}
|
|
94
94
|
// process each dependency
|
|
95
95
|
for (const [name, declaredVersion] of Object.entries(allDependencies)) {
|
|
96
|
-
|
|
96
|
+
// Handle scoped packages (@scope/package) by splitting on '/' for cross-platform compatibility
|
|
97
|
+
const dependencyPath = path.join(nodeModulesPath, ...name.split('/'));
|
|
97
98
|
// Check if dependency exists in node_modules
|
|
98
99
|
if (fs.existsSync(dependencyPath)) {
|
|
99
100
|
// Read the actual version from the dependency's package.json
|
|
@@ -112,6 +113,7 @@ class JSTSDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
|
|
|
112
113
|
name,
|
|
113
114
|
version: actualVersion.toString().replace(/[\^~]/g, ''), // Remove ^ and ~ from version
|
|
114
115
|
path: dependencyPath,
|
|
116
|
+
pathInZipOverride: name, // either package or @scope/package
|
|
115
117
|
size: this.getDirectorySize(dependencyPath),
|
|
116
118
|
zipped: false,
|
|
117
119
|
});
|
|
@@ -169,7 +171,8 @@ class JSTSDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
|
|
|
169
171
|
const callBackDependencyUpdate = async (events) => {
|
|
170
172
|
this.logging.log(`Change detected in ${packageJsonPath}`);
|
|
171
173
|
const updatedDependencyMap = this.generateDependencyMap(jstsDependencyInfo);
|
|
172
|
-
|
|
174
|
+
const changedDependencyList = this.compareAndUpdateDependencyMap(jstsDependencyInfo.workspaceFolder, updatedDependencyMap);
|
|
175
|
+
await this.zipAndUploadDependenciesByChunk(changedDependencyList, jstsDependencyInfo.workspaceFolder);
|
|
173
176
|
};
|
|
174
177
|
const watcher = new DependencyWatcher_1.DependencyWatcher(packageJsonPath, callBackDependencyUpdate, this.logging, this.DEPENDENCY_WATCHER_EVENT_BATCH_INTERVAL);
|
|
175
178
|
this.dependencyWatchers.set(packageJsonPath, watcher);
|
|
@@ -180,7 +183,9 @@ class JSTSDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
|
|
|
180
183
|
});
|
|
181
184
|
}
|
|
182
185
|
// JS and TS are not using LSP to sync dependencies
|
|
183
|
-
|
|
186
|
+
updateDependencyMapBasedOnLSP(paths, workspaceFolder) {
|
|
187
|
+
return [];
|
|
188
|
+
}
|
|
184
189
|
transformPathToDependency(dependencyName, dependencyPath, dependencyMap) { }
|
|
185
190
|
disposeWatchers(workspaceFolder) {
|
|
186
191
|
this.jstsDependencyInfos.forEach((jstsDependencyInfo) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JSTSDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/JSTSDependencyHandler.ts"],"names":[],"mappings":"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
|
|
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
|
@@ -50,9 +50,7 @@ class JavaDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
|
|
|
50
50
|
// TODO, check if try catch is necessary here
|
|
51
51
|
try {
|
|
52
52
|
let generatedDependencyMap = this.generateDependencyMap(javaDependencyInfo);
|
|
53
|
-
this.compareAndUpdateDependencyMap(javaDependencyInfo.workspaceFolder, generatedDependencyMap)
|
|
54
|
-
this.logging.warn(`Error processing Java dependencies: ${error}`);
|
|
55
|
-
});
|
|
53
|
+
this.compareAndUpdateDependencyMap(javaDependencyInfo.workspaceFolder, generatedDependencyMap);
|
|
56
54
|
// Log found dependencies
|
|
57
55
|
this.logging.log(`Total Java dependencies found: ${generatedDependencyMap.size} under ${javaDependencyInfo.pkgDir}`);
|
|
58
56
|
}
|
|
@@ -80,7 +78,8 @@ class JavaDependencyHandler extends LanguageDependencyHandler_1.LanguageDependen
|
|
|
80
78
|
const callBackDependencyUpdate = async (events) => {
|
|
81
79
|
this.logging.log(`Change detected in ${dotClasspathPath}`);
|
|
82
80
|
const updatedDependencyMap = this.generateDependencyMap(javaDependencyInfo);
|
|
83
|
-
|
|
81
|
+
const changedDependencyList = this.compareAndUpdateDependencyMap(javaDependencyInfo.workspaceFolder, updatedDependencyMap);
|
|
82
|
+
await this.zipAndUploadDependenciesByChunk(changedDependencyList, javaDependencyInfo.workspaceFolder);
|
|
84
83
|
};
|
|
85
84
|
const watcher = new DependencyWatcher_1.DependencyWatcher(dotClasspathPath, callBackDependencyUpdate, this.logging, this.DEPENDENCY_WATCHER_EVENT_BATCH_INTERVAL);
|
|
86
85
|
this.dependencyWatchers.set(dotClasspathPath, watcher);
|
|
@@ -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;AAEhC,2DAAuD;AAMvD;;;;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,
|
|
1
|
+
{"version":3,"file":"JavaDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/JavaDependencyHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export interface Dependency {
|
|
|
6
6
|
name: string;
|
|
7
7
|
version: string;
|
|
8
8
|
path: string;
|
|
9
|
+
pathInZipOverride?: string;
|
|
9
10
|
size: number;
|
|
10
11
|
zipped: boolean;
|
|
11
12
|
}
|
|
@@ -50,12 +51,12 @@ export declare abstract class LanguageDependencyHandler<T extends BaseDependency
|
|
|
50
51
|
* @param paths
|
|
51
52
|
* @param workspaceRoot
|
|
52
53
|
*/
|
|
53
|
-
updateDependencyMapBasedOnLSP(paths: string[], workspaceFolder
|
|
54
|
+
updateDependencyMapBasedOnLSP(paths: string[], workspaceFolder: WorkspaceFolder): Dependency[];
|
|
54
55
|
zipDependencyMap(folders: WorkspaceFolder[]): Promise<void>;
|
|
55
|
-
|
|
56
|
+
zipAndUploadDependenciesByChunk(dependencyList: Dependency[], workspaceFolder: WorkspaceFolder): Promise<void>;
|
|
56
57
|
private processChunk;
|
|
57
58
|
protected abstract generateDependencyMap(dependencyInfo: T, dependencyMap: Map<string, Dependency>): void;
|
|
58
|
-
protected compareAndUpdateDependencyMap(workspaceFolder: WorkspaceFolder, updatedDependencyMap: Map<string, Dependency
|
|
59
|
+
protected compareAndUpdateDependencyMap(workspaceFolder: WorkspaceFolder, updatedDependencyMap: Map<string, Dependency>): Dependency[];
|
|
59
60
|
private validateSingleDependencySize;
|
|
60
61
|
/**
|
|
61
62
|
* This validation will calculate how such of size of dependencies uploaded per workspace.
|
|
@@ -49,16 +49,14 @@ class LanguageDependencyHandler {
|
|
|
49
49
|
* @param paths
|
|
50
50
|
* @param workspaceRoot
|
|
51
51
|
*/
|
|
52
|
-
|
|
52
|
+
updateDependencyMapBasedOnLSP(paths, workspaceFolder) {
|
|
53
53
|
const dependencyMap = new Map();
|
|
54
54
|
paths.forEach((dependencyPath) => {
|
|
55
55
|
// basename of the path should be the dependency name
|
|
56
56
|
const dependencyName = path.basename(dependencyPath);
|
|
57
57
|
this.transformPathToDependency(dependencyName, dependencyPath, dependencyMap);
|
|
58
58
|
});
|
|
59
|
-
|
|
60
|
-
await this.compareAndUpdateDependencyMap(workspaceFolder, dependencyMap, true);
|
|
61
|
-
}
|
|
59
|
+
return this.compareAndUpdateDependencyMap(workspaceFolder, dependencyMap);
|
|
62
60
|
}
|
|
63
61
|
async zipDependencyMap(folders) {
|
|
64
62
|
// Process each workspace folder sequentially
|
|
@@ -125,7 +123,7 @@ class LanguageDependencyHandler {
|
|
|
125
123
|
for (const dependency of chunk) {
|
|
126
124
|
try {
|
|
127
125
|
if (fs.existsSync(dependency.path)) {
|
|
128
|
-
const fileMetadata = await this.artifactManager.getFileMetadata(workspaceFolder, dependency.path, this.language, path.basename(dependency.path));
|
|
126
|
+
const fileMetadata = await this.artifactManager.getFileMetadata(workspaceFolder, dependency.path, this.language, dependency.pathInZipOverride || path.basename(dependency.path));
|
|
129
127
|
fileMetadataList.push(...fileMetadata);
|
|
130
128
|
}
|
|
131
129
|
}
|
|
@@ -147,7 +145,7 @@ class LanguageDependencyHandler {
|
|
|
147
145
|
}
|
|
148
146
|
}
|
|
149
147
|
}
|
|
150
|
-
|
|
148
|
+
compareAndUpdateDependencyMap(workspaceFolder, updatedDependencyMap) {
|
|
151
149
|
const changes = {
|
|
152
150
|
added: [],
|
|
153
151
|
updated: [],
|
|
@@ -179,9 +177,7 @@ class LanguageDependencyHandler {
|
|
|
179
177
|
updatedDependencyMap.forEach((newDep, name) => {
|
|
180
178
|
this.dependencyMap.get(workspaceFolder)?.set(name, newDep);
|
|
181
179
|
});
|
|
182
|
-
|
|
183
|
-
await this.zipAndUploadDependenciesByChunk([...changes.added, ...changes.updated], workspaceFolder);
|
|
184
|
-
}
|
|
180
|
+
return [...changes.added, ...changes.updated];
|
|
185
181
|
}
|
|
186
182
|
validateSingleDependencySize(workspaceFolder, dependency) {
|
|
187
183
|
return dependency.size < this.MAX_SINGLE_DEPENDENCY_SIZE;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LanguageDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/LanguageDependencyHandler.ts"],"names":[],"mappings":";;;AACA,yBAAwB;AAExB,6BAA6B;AAE7B,qCAAwC;
|
|
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/PythonDependencyHandler.js
CHANGED
|
@@ -69,9 +69,7 @@ class PythonDependencyHandler extends LanguageDependencyHandler_1.LanguageDepend
|
|
|
69
69
|
// TODO, check if the try catch is necessary here
|
|
70
70
|
try {
|
|
71
71
|
let generatedDependencyMap = this.generateDependencyMap(pythonDependencyInfo);
|
|
72
|
-
this.compareAndUpdateDependencyMap(pythonDependencyInfo.workspaceFolder, generatedDependencyMap)
|
|
73
|
-
this.logging.warn(`Error processing Python dependencies: ${error}`);
|
|
74
|
-
});
|
|
72
|
+
this.compareAndUpdateDependencyMap(pythonDependencyInfo.workspaceFolder, generatedDependencyMap);
|
|
75
73
|
// Log found dependencies
|
|
76
74
|
this.logging.log(`Total Python dependencies found: ${generatedDependencyMap.size} under ${pythonDependencyInfo.pkgDir}`);
|
|
77
75
|
}
|
|
@@ -107,7 +105,8 @@ class PythonDependencyHandler extends LanguageDependencyHandler_1.LanguageDepend
|
|
|
107
105
|
this.handlePackageChange(sitePackagesPath, fileName, updatedDependencyMap);
|
|
108
106
|
}
|
|
109
107
|
}
|
|
110
|
-
|
|
108
|
+
const changedDependencyList = this.compareAndUpdateDependencyMap(pythonDependencyInfo.workspaceFolder, updatedDependencyMap);
|
|
109
|
+
await this.zipAndUploadDependenciesByChunk(changedDependencyList, pythonDependencyInfo.workspaceFolder);
|
|
111
110
|
}; // end of callback function
|
|
112
111
|
const watcher = new DependencyWatcher_1.DependencyWatcher(sitePackagesPath, callBackDependencyUpdate, this.logging, this.DEPENDENCY_WATCHER_EVENT_BATCH_INTERVAL);
|
|
113
112
|
this.dependencyWatchers.set(sitePackagesPath, watcher);
|
|
@@ -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;AACxB,qCAAwD;AACxD,2DAAuD;AAOvD;;;;GAIG;AACH,MAAa,uBAAwB,SAAQ,qDAA+C;IAChF,qBAAqB,GAA2B,EAAE,CAAA;IAE1D;;;;;;OAMG;IACH,QAAQ,CAAC,UAAkB,EAAE,eAAgC;QACzD,IAAI,MAAM,GAAgC,IAAI,CAAA;QAC9C,MAAM,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAAA;QACjF,IAAI,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1F,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,kCAAkC,UAAU,EAAE,CAAC,CAAA;YAChE,IAAI,eAAe,CAAA;YACnB,IAAI,CAAC;gBACD,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CAAA;YACnF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;gBACxD,OAAO,KAAK,CAAA;YAChB,CAAC;YACD,2CAA2C;YAC3C,MAAM,aAAa,GAAG,CAAC,eAAe,CAAC,4BAA4B,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAe,EAAE,EAAE,CAChG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CACxC,CAAA;YACD,MAAM,iBAAiB,GAAG,CAAC,eAAe,CAAC,gCAAgC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAe,EAAE,EAAE,CACxG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CACxC,CAAA;YACD,4CAA4C;YAC5C,MAAM,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAA;YAC9F,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAA;YAC1E,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG;oBACL,MAAM,EAAE,UAAU;oBAClB,uBAAuB,EAAE,uBAAuB;oBAChD,iBAAiB,EAAE,iBAAiB;oBACpC,eAAe,EAAE,eAAe;iBACnC,CAAA;gBACD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YAC3C,CAAC;QACL,CAAC;QACD,OAAO,MAAM,KAAK,IAAI,CAAA;IAC1B,CAAC;IAED;;;;;;OAMG;IACH,qBAAqB,CAAC,OAA0B;QAC5C,6DAA6D;QAC7D,MAAM,iCAAiC,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;YAC/F,OAAO,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAA;QACjE,CAAC,CAAC,CAAA;QAEF,iCAAiC,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;YAC7D,iDAAiD;YACjD,IAAI,CAAC;gBACD,IAAI,sBAAsB,GAA4B,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,CAAA;gBACtG,IAAI,CAAC,6BAA6B,CAAC,oBAAoB,CAAC,eAAe,EAAE,sBAAsB,CAAC,
|
|
1
|
+
{"version":3,"file":"PythonDependencyHandler.js","sourceRoot":"","sources":["../../../../../src/language-server/workspaceContext/dependency/dependencyHandler/PythonDependencyHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -200,7 +200,7 @@ const WorkspaceContextServer = () => features => {
|
|
|
200
200
|
dependencyDiscoverer = new dependencyDiscoverer_1.DependencyDiscoverer(workspace, logging, workspaceFolders, artifactManager);
|
|
201
201
|
workspaceFolderManager = workspaceFolderManager_1.WorkspaceFolderManager.createInstance(amazonQServiceManager, logging, artifactManager, dependencyDiscoverer, workspaceFolders, credentialsProvider, workspaceIdentifier);
|
|
202
202
|
fileUploadJobManager = new fileUploadJobManager_1.FileUploadJobManager(logging, workspaceFolderManager);
|
|
203
|
-
dependencyEventBundler = new dependencyEventBundler_1.DependencyEventBundler(logging, dependencyDiscoverer);
|
|
203
|
+
dependencyEventBundler = new dependencyEventBundler_1.DependencyEventBundler(logging, dependencyDiscoverer, workspaceFolderManager);
|
|
204
204
|
await updateConfiguration();
|
|
205
205
|
lsp.workspace.onDidChangeWorkspaceFolders(async (params) => {
|
|
206
206
|
const addedFolders = params.event.added;
|
|
@@ -442,16 +442,20 @@ const WorkspaceContextServer = () => features => {
|
|
|
442
442
|
});
|
|
443
443
|
lsp.extensions.onDidChangeDependencyPaths(async (params) => {
|
|
444
444
|
try {
|
|
445
|
+
const dependencyEvent = {
|
|
446
|
+
language: params.runtimeLanguage,
|
|
447
|
+
paths: params.paths,
|
|
448
|
+
workspaceFolderUri: params.moduleName,
|
|
449
|
+
};
|
|
450
|
+
dependencyEventBundler_1.DependencyEventBundler.recordDependencyEvent(dependencyEvent);
|
|
445
451
|
if (!isUserEligibleForWorkspaceContext()) {
|
|
446
452
|
return;
|
|
447
453
|
}
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
workspaceFolder: workspaceFolder,
|
|
454
|
-
});
|
|
454
|
+
// Only send events separately when dependency discovery has finished ingesting previous recorded events
|
|
455
|
+
if (dependencyDiscoverer.isDependencyEventsIngested(params.moduleName)) {
|
|
456
|
+
dependencyEventBundler.sendDependencyEvent(dependencyEvent);
|
|
457
|
+
logging.log(`Processed onDidChangeDependencyPaths event for ${params.moduleName}`);
|
|
458
|
+
}
|
|
455
459
|
}
|
|
456
460
|
catch (error) {
|
|
457
461
|
logging.error(`Error handling didChangeDependencyPaths event: ${error}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaceContextServer.js","sourceRoot":"","sources":["../../../src/language-server/workspaceContext/workspaceContextServer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspaceContextServer.js","sourceRoot":"","sources":["../../../src/language-server/workspaceContext/workspaceContextServer.ts"],"names":[],"mappings":"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"}
|