@theia/plugin-ext 1.75.0-next.3 → 1.75.0-next.34

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 (191) hide show
  1. package/lib/common/errors.d.ts +1 -14
  2. package/lib/common/errors.d.ts.map +1 -1
  3. package/lib/common/errors.js +3 -16
  4. package/lib/common/errors.js.map +1 -1
  5. package/lib/common/plugin-api-rpc.d.ts +1 -1
  6. package/lib/common/plugin-api-rpc.d.ts.map +1 -1
  7. package/lib/common/plugin-protocol.d.ts +53 -648
  8. package/lib/common/plugin-protocol.d.ts.map +1 -1
  9. package/lib/common/plugin-protocol.js +11 -34
  10. package/lib/common/plugin-protocol.js.map +1 -1
  11. package/lib/hosted/browser/hosted-plugin.d.ts +2 -1
  12. package/lib/hosted/browser/hosted-plugin.d.ts.map +1 -1
  13. package/lib/hosted/browser/hosted-plugin.js +8 -3
  14. package/lib/hosted/browser/hosted-plugin.js.map +1 -1
  15. package/lib/hosted/browser/worker/plugin-manifest-loader.d.ts.map +1 -1
  16. package/lib/hosted/browser/worker/plugin-manifest-loader.js +5 -36
  17. package/lib/hosted/browser/worker/plugin-manifest-loader.js.map +1 -1
  18. package/lib/hosted/browser/worker/worker-main.js +2 -1
  19. package/lib/hosted/browser/worker/worker-main.js.map +1 -1
  20. package/lib/hosted/common/hosted-plugin.js +10 -9
  21. package/lib/hosted/common/hosted-plugin.js.map +1 -1
  22. package/lib/hosted/common/hosted-plugin.spec.js +2 -0
  23. package/lib/hosted/common/hosted-plugin.spec.js.map +1 -1
  24. package/lib/hosted/node/hosted-plugin-localization-service.d.ts.map +1 -1
  25. package/lib/hosted/node/hosted-plugin-localization-service.js +4 -68
  26. package/lib/hosted/node/hosted-plugin-localization-service.js.map +1 -1
  27. package/lib/hosted/node/hosted-plugin-process.js +1 -0
  28. package/lib/hosted/node/hosted-plugin-process.js.map +1 -1
  29. package/lib/hosted/node/hosted-plugin.js +1 -0
  30. package/lib/hosted/node/hosted-plugin.js.map +1 -1
  31. package/lib/hosted/node/plugin-host-rpc.d.ts.map +1 -1
  32. package/lib/hosted/node/plugin-host-rpc.js +2 -2
  33. package/lib/hosted/node/plugin-host-rpc.js.map +1 -1
  34. package/lib/hosted/node/plugin-reader.d.ts.map +1 -1
  35. package/lib/hosted/node/plugin-reader.js +6 -4
  36. package/lib/hosted/node/plugin-reader.js.map +1 -1
  37. package/lib/hosted/node/plugin-service.js +1 -0
  38. package/lib/hosted/node/plugin-service.js.map +1 -1
  39. package/lib/hosted/node/scanners/grammars-reader.d.ts +3 -2
  40. package/lib/hosted/node/scanners/grammars-reader.d.ts.map +1 -1
  41. package/lib/hosted/node/scanners/grammars-reader.js +5 -23
  42. package/lib/hosted/node/scanners/grammars-reader.js.map +1 -1
  43. package/lib/hosted/node/scanners/scanner-theia.d.ts +38 -71
  44. package/lib/hosted/node/scanners/scanner-theia.d.ts.map +1 -1
  45. package/lib/hosted/node/scanners/scanner-theia.js +117 -768
  46. package/lib/hosted/node/scanners/scanner-theia.js.map +1 -1
  47. package/lib/hosted/node/scanners/scanner-theia.spec.js +191 -0
  48. package/lib/hosted/node/scanners/scanner-theia.spec.js.map +1 -1
  49. package/lib/main/browser/comments/comments-service.d.ts +2 -0
  50. package/lib/main/browser/comments/comments-service.d.ts.map +1 -1
  51. package/lib/main/browser/comments/comments-service.js +7 -1
  52. package/lib/main/browser/comments/comments-service.js.map +1 -1
  53. package/lib/main/browser/custom-editors/plugin-custom-editor-registry.d.ts +2 -1
  54. package/lib/main/browser/custom-editors/plugin-custom-editor-registry.d.ts.map +1 -1
  55. package/lib/main/browser/custom-editors/plugin-custom-editor-registry.js +6 -1
  56. package/lib/main/browser/custom-editors/plugin-custom-editor-registry.js.map +1 -1
  57. package/lib/main/browser/debug/plugin-debug-session-contribution-registry.d.ts +2 -0
  58. package/lib/main/browser/debug/plugin-debug-session-contribution-registry.d.ts.map +1 -1
  59. package/lib/main/browser/debug/plugin-debug-session-contribution-registry.js +7 -1
  60. package/lib/main/browser/debug/plugin-debug-session-contribution-registry.js.map +1 -1
  61. package/lib/main/browser/menus/menus-contribution-handler.d.ts +2 -1
  62. package/lib/main/browser/menus/menus-contribution-handler.d.ts.map +1 -1
  63. package/lib/main/browser/menus/menus-contribution-handler.js +9 -4
  64. package/lib/main/browser/menus/menus-contribution-handler.js.map +1 -1
  65. package/lib/main/browser/plugin-contribution-handler.js +1 -1
  66. package/lib/main/browser/plugin-contribution-handler.js.map +1 -1
  67. package/lib/main/browser/plugin-icon-service.d.ts.map +1 -1
  68. package/lib/main/browser/plugin-icon-service.js +2 -1
  69. package/lib/main/browser/plugin-icon-service.js.map +1 -1
  70. package/lib/main/browser/plugin-icon-theme-service.d.ts.map +1 -1
  71. package/lib/main/browser/plugin-icon-theme-service.js +2 -1
  72. package/lib/main/browser/plugin-icon-theme-service.js.map +1 -1
  73. package/lib/main/browser/plugin-shared-style.d.ts.map +1 -1
  74. package/lib/main/browser/plugin-shared-style.js +2 -1
  75. package/lib/main/browser/plugin-shared-style.js.map +1 -1
  76. package/lib/main/browser/scm-main.d.ts.map +1 -1
  77. package/lib/main/browser/scm-main.js +3 -1
  78. package/lib/main/browser/scm-main.js.map +1 -1
  79. package/lib/main/browser/text-editor-model-service.d.ts +2 -1
  80. package/lib/main/browser/text-editor-model-service.d.ts.map +1 -1
  81. package/lib/main/browser/text-editor-model-service.js +6 -1
  82. package/lib/main/browser/text-editor-model-service.js.map +1 -1
  83. package/lib/main/browser/view/plugin-view-registry.d.ts +2 -0
  84. package/lib/main/browser/view/plugin-view-registry.d.ts.map +1 -1
  85. package/lib/main/browser/view/plugin-view-registry.js +14 -9
  86. package/lib/main/browser/view/plugin-view-registry.js.map +1 -1
  87. package/lib/main/browser/view/tree-view-widget.d.ts +3 -0
  88. package/lib/main/browser/view/tree-view-widget.d.ts.map +1 -1
  89. package/lib/main/browser/view/tree-view-widget.js +17 -6
  90. package/lib/main/browser/view/tree-view-widget.js.map +1 -1
  91. package/lib/main/browser/webview/webview.d.ts.map +1 -1
  92. package/lib/main/browser/webview/webview.js +4 -2
  93. package/lib/main/browser/webview/webview.js.map +1 -1
  94. package/lib/main/browser/webview-views/webview-views-main.d.ts.map +1 -1
  95. package/lib/main/browser/webview-views/webview-views-main.js +3 -2
  96. package/lib/main/browser/webview-views/webview-views-main.js.map +1 -1
  97. package/lib/main/node/handlers/plugin-theia-directory-handler.d.ts +2 -1
  98. package/lib/main/node/handlers/plugin-theia-directory-handler.d.ts.map +1 -1
  99. package/lib/main/node/handlers/plugin-theia-directory-handler.js +10 -4
  100. package/lib/main/node/handlers/plugin-theia-directory-handler.js.map +1 -1
  101. package/lib/main/node/handlers/plugin-theia-file-handler.d.ts +2 -0
  102. package/lib/main/node/handlers/plugin-theia-file-handler.d.ts.map +1 -1
  103. package/lib/main/node/handlers/plugin-theia-file-handler.js +9 -3
  104. package/lib/main/node/handlers/plugin-theia-file-handler.js.map +1 -1
  105. package/lib/main/node/paths/plugin-paths-service.js +1 -0
  106. package/lib/main/node/paths/plugin-paths-service.js.map +1 -1
  107. package/lib/main/node/plugin-deployer-contribution.js +1 -0
  108. package/lib/main/node/plugin-deployer-contribution.js.map +1 -1
  109. package/lib/main/node/plugin-deployer-impl.d.ts.map +1 -1
  110. package/lib/main/node/plugin-deployer-impl.js +16 -13
  111. package/lib/main/node/plugin-deployer-impl.js.map +1 -1
  112. package/lib/main/node/plugin-service.d.ts +2 -0
  113. package/lib/main/node/plugin-service.d.ts.map +1 -1
  114. package/lib/main/node/plugin-service.js +7 -1
  115. package/lib/main/node/plugin-service.js.map +1 -1
  116. package/lib/main/node/plugin-uninstallation-manager.d.ts +2 -1
  117. package/lib/main/node/plugin-uninstallation-manager.d.ts.map +1 -1
  118. package/lib/main/node/plugin-uninstallation-manager.js +6 -1
  119. package/lib/main/node/plugin-uninstallation-manager.js.map +1 -1
  120. package/lib/main/node/plugins-key-value-storage.d.ts +2 -0
  121. package/lib/main/node/plugins-key-value-storage.d.ts.map +1 -1
  122. package/lib/main/node/plugins-key-value-storage.js +9 -3
  123. package/lib/main/node/plugins-key-value-storage.js.map +1 -1
  124. package/lib/main/node/resolvers/local-plugin-deployer-resolver.d.ts +2 -0
  125. package/lib/main/node/resolvers/local-plugin-deployer-resolver.d.ts.map +1 -1
  126. package/lib/main/node/resolvers/local-plugin-deployer-resolver.js +7 -1
  127. package/lib/main/node/resolvers/local-plugin-deployer-resolver.js.map +1 -1
  128. package/lib/main/node/webview-backend-security-warnings.d.ts +2 -0
  129. package/lib/main/node/webview-backend-security-warnings.d.ts.map +1 -1
  130. package/lib/main/node/webview-backend-security-warnings.js +7 -1
  131. package/lib/main/node/webview-backend-security-warnings.js.map +1 -1
  132. package/lib/plugin/scm.js +1 -1
  133. package/lib/plugin/scm.js.map +1 -1
  134. package/package.json +31 -30
  135. package/src/common/errors.ts +1 -25
  136. package/src/common/plugin-api-rpc.ts +1 -1
  137. package/src/common/plugin-protocol.ts +203 -662
  138. package/src/hosted/browser/hosted-plugin.ts +8 -5
  139. package/src/hosted/browser/worker/plugin-manifest-loader.ts +8 -41
  140. package/src/hosted/browser/worker/worker-main.ts +2 -1
  141. package/src/hosted/common/hosted-plugin.spec.ts +2 -0
  142. package/src/hosted/common/hosted-plugin.ts +10 -10
  143. package/src/hosted/node/hosted-plugin-localization-service.ts +3 -82
  144. package/src/hosted/node/hosted-plugin-process.ts +1 -1
  145. package/src/hosted/node/hosted-plugin.ts +2 -2
  146. package/src/hosted/node/plugin-host-rpc.ts +3 -3
  147. package/src/hosted/node/plugin-reader.ts +7 -6
  148. package/src/hosted/node/plugin-service.ts +1 -1
  149. package/src/hosted/node/scanners/grammars-reader.ts +14 -23
  150. package/src/hosted/node/scanners/scanner-theia.spec.ts +225 -1
  151. package/src/hosted/node/scanners/scanner-theia.ts +204 -881
  152. package/src/main/browser/comments/comments-service.ts +6 -2
  153. package/src/main/browser/custom-editors/plugin-custom-editor-registry.ts +6 -3
  154. package/src/main/browser/debug/plugin-debug-session-contribution-registry.ts +5 -1
  155. package/src/main/browser/menus/menus-contribution-handler.ts +9 -6
  156. package/src/main/browser/plugin-contribution-handler.ts +1 -1
  157. package/src/main/browser/plugin-icon-service.ts +2 -1
  158. package/src/main/browser/plugin-icon-theme-service.ts +2 -1
  159. package/src/main/browser/plugin-shared-style.ts +2 -1
  160. package/src/main/browser/scm-main.ts +3 -1
  161. package/src/main/browser/text-editor-model-service.ts +6 -3
  162. package/src/main/browser/view/plugin-view-registry.ts +14 -11
  163. package/src/main/browser/view/tree-view-widget.tsx +14 -7
  164. package/src/main/browser/webview/webview.ts +4 -2
  165. package/src/main/browser/webview-views/webview-views-main.ts +4 -4
  166. package/src/main/node/handlers/plugin-theia-directory-handler.ts +9 -6
  167. package/src/main/node/handlers/plugin-theia-file-handler.ts +8 -5
  168. package/src/main/node/paths/plugin-paths-service.ts +2 -2
  169. package/src/main/node/plugin-deployer-contribution.ts +2 -2
  170. package/src/main/node/plugin-deployer-impl.ts +20 -14
  171. package/src/main/node/plugin-service.ts +6 -2
  172. package/src/main/node/plugin-uninstallation-manager.ts +7 -4
  173. package/src/main/node/plugins-key-value-storage.ts +8 -4
  174. package/src/main/node/resolvers/local-plugin-deployer-resolver.ts +7 -2
  175. package/src/main/node/webview-backend-security-warnings.ts +6 -2
  176. package/src/plugin/scm.ts +1 -1
  177. package/lib/hosted/node/plugin-activation-events.d.ts +0 -7
  178. package/lib/hosted/node/plugin-activation-events.d.ts.map +0 -1
  179. package/lib/hosted/node/plugin-activation-events.js +0 -95
  180. package/lib/hosted/node/plugin-activation-events.js.map +0 -1
  181. package/lib/hosted/node/plugin-manifest-loader.d.ts +0 -3
  182. package/lib/hosted/node/plugin-manifest-loader.d.ts.map +0 -1
  183. package/lib/hosted/node/plugin-manifest-loader.js +0 -34
  184. package/lib/hosted/node/plugin-manifest-loader.js.map +0 -1
  185. package/lib/main/node/errors.spec.d.ts +0 -2
  186. package/lib/main/node/errors.spec.d.ts.map +0 -1
  187. package/lib/main/node/errors.spec.js +0 -36
  188. package/lib/main/node/errors.spec.js.map +0 -1
  189. package/src/hosted/node/plugin-activation-events.ts +0 -112
  190. package/src/hosted/node/plugin-manifest-loader.ts +0 -32
  191. package/src/main/node/errors.spec.ts +0 -37
@@ -232,26 +232,29 @@ let PluginDeployerImpl = class PluginDeployerImpl {
232
232
  * deploy all plugins that have been accepted
233
233
  */
234
234
  async deployPlugins(pluginsToDeploy) {
235
- const acceptedPlugins = pluginsToDeploy.filter(pluginDeployerEntry => pluginDeployerEntry.isAccepted());
235
+ const acceptedPlugins = pluginsToDeploy.filter(pluginDeployerEntry => pluginDeployerEntry.isAccepted(plugin_protocol_1.PluginDeployerEntryType.FRONTEND, plugin_protocol_1.PluginDeployerEntryType.BACKEND, plugin_protocol_1.PluginDeployerEntryType.HEADLESS));
236
236
  const acceptedFrontendPlugins = pluginsToDeploy.filter(pluginDeployerEntry => pluginDeployerEntry.isAccepted(plugin_protocol_1.PluginDeployerEntryType.FRONTEND));
237
237
  const acceptedBackendPlugins = pluginsToDeploy.filter(pluginDeployerEntry => pluginDeployerEntry.isAccepted(plugin_protocol_1.PluginDeployerEntryType.BACKEND));
238
238
  const acceptedHeadlessPlugins = pluginsToDeploy.filter(pluginDeployerEntry => pluginDeployerEntry.isAccepted(plugin_protocol_1.PluginDeployerEntryType.HEADLESS));
239
- this.logger.debug('the accepted plugins are', acceptedPlugins);
240
- this.logger.debug('the acceptedFrontendPlugins plugins are', acceptedFrontendPlugins);
241
- this.logger.debug('the acceptedBackendPlugins plugins are', acceptedBackendPlugins);
242
- this.logger.debug('the acceptedHeadlessPlugins plugins are', acceptedHeadlessPlugins);
243
- acceptedPlugins.forEach(plugin => {
244
- this.logger.debug('will deploy plugin', plugin.id(), 'with changes', JSON.stringify(plugin.getChanges()), 'and this plugin has been resolved by', plugin.resolvedBy());
239
+ this.logger.debug(log => {
240
+ log('the accepted plugins are', acceptedPlugins);
241
+ log('the acceptedFrontendPlugins plugins are', acceptedFrontendPlugins);
242
+ log('the acceptedBackendPlugins plugins are', acceptedBackendPlugins);
243
+ log('the acceptedHeadlessPlugins plugins are', acceptedHeadlessPlugins);
244
+ acceptedPlugins.forEach(plugin => {
245
+ log('will deploy plugin', plugin.id(), 'with changes', JSON.stringify(plugin.getChanges()), 'and this plugin has been resolved by', plugin.resolvedBy());
246
+ });
245
247
  });
246
248
  // local path to launch
247
249
  const pluginPaths = [...acceptedBackendPlugins, ...acceptedHeadlessPlugins].map(pluginEntry => pluginEntry.path());
248
250
  this.logger.debug('local path to deploy on remote instance', pluginPaths);
249
- const deployments = [];
250
- // start the backend plugins
251
- deployments.push(await this.pluginDeployerHandler.deployBackendPlugins(acceptedBackendPlugins));
252
- // headless plugins are deployed like backend plugins
253
- deployments.push(await this.pluginDeployerHandler.deployBackendPlugins(acceptedHeadlessPlugins));
254
- deployments.push(await this.pluginDeployerHandler.deployFrontendPlugins(acceptedFrontendPlugins));
251
+ const deployPluginsMeasurement = this.measure('deployPluginsBatch');
252
+ const deployments = await Promise.all([
253
+ // start the backend and headless plugins
254
+ this.pluginDeployerHandler.deployBackendPlugins([...acceptedBackendPlugins, ...acceptedHeadlessPlugins]),
255
+ this.pluginDeployerHandler.deployFrontendPlugins(acceptedFrontendPlugins)
256
+ ]);
257
+ deployPluginsMeasurement.log(`Deploy batch of ${acceptedPlugins.length} accepted plugins`);
255
258
  this.onDidDeployEmitter.fire(undefined);
256
259
  return deployments.reduce((accumulated, current) => accumulated += current ?? 0, 0);
257
260
  }
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-deployer-impl.js","sourceRoot":"","sources":["../../../src/main/node/plugin-deployer-impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin-deployer-impl.js","sourceRoot":"","sources":["../../../src/main/node/plugin-deployer-impl.ts"],"names":[],"mappings":"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"}
@@ -5,11 +5,13 @@ import { WsRequestValidatorContribution } from '@theia/core/lib/node/ws-request-
5
5
  import { MaybePromise } from '@theia/core/lib/common';
6
6
  import { ApplicationPackage } from '@theia/core/shared/@theia/application-package';
7
7
  import { BackendRemoteService } from '@theia/core/lib/node/remote/backend-remote-service';
8
+ import { ILogger } from '@theia/core';
8
9
  export declare class PluginApiContribution implements BackendApplicationContribution, WsRequestValidatorContribution {
9
10
  protected webviewExternalEndpointRegExp: RegExp;
10
11
  protected serveSameOrigin: boolean;
11
12
  protected readonly applicationPackage: ApplicationPackage;
12
13
  protected readonly remoteService: BackendRemoteService;
14
+ protected readonly logger: ILogger;
13
15
  protected init(): void;
14
16
  configure(app: express.Application): void;
15
17
  allowWsUpgrade(request: http.IncomingMessage): MaybePromise<boolean>;
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-service.d.ts","sourceRoot":"","sources":["../../../src/main/node/plugin-service.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,KAAK,OAAO,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAI1F,OAAO,EAAE,8BAA8B,EAAE,MAAM,4CAA4C,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAE1F,qBACa,qBAAsB,YAAW,8BAA8B,EAAE,8BAA8B;IAExG,SAAS,CAAC,6BAA6B,EAAE,MAAM,CAAC;IAEhD,SAAS,CAAC,eAAe,EAAE,OAAO,CAAS;IAG3C,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAGvD,SAAS,CAAC,IAAI,IAAI,IAAI;IAMtB,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,GAAG,IAAI;IAazC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC;IAgBpE,SAAS,CAAC,8BAA8B,IAAI,MAAM;IAalD;;OAEG;IACH,SAAS,CAAC,uBAAuB,IAAI,MAAM;CAM9C"}
1
+ {"version":3,"file":"plugin-service.d.ts","sourceRoot":"","sources":["../../../src/main/node/plugin-service.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,KAAK,OAAO,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAI1F,OAAO,EAAE,8BAA8B,EAAE,MAAM,4CAA4C,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oDAAoD,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,qBAAsB,YAAW,8BAA8B,EAAE,8BAA8B;IAExG,SAAS,CAAC,6BAA6B,EAAE,MAAM,CAAC;IAEhD,SAAS,CAAC,eAAe,EAAE,OAAO,CAAS;IAG3C,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,IAAI,IAAI,IAAI;IAMtB,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,GAAG,IAAI;IAazC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC;IAgBpE,SAAS,CAAC,8BAA8B,IAAI,MAAM;IAalD;;OAEG;IACH,SAAS,CAAC,uBAAuB,IAAI,MAAM;CAM9C"}
@@ -25,13 +25,14 @@ const webview_protocol_1 = require("../common/webview-protocol");
25
25
  const environment_1 = require("@theia/core/shared/@theia/application-package/lib/environment");
26
26
  const application_package_1 = require("@theia/core/shared/@theia/application-package");
27
27
  const backend_remote_service_1 = require("@theia/core/lib/node/remote/backend-remote-service");
28
+ const core_1 = require("@theia/core");
28
29
  let PluginApiContribution = class PluginApiContribution {
29
30
  constructor() {
30
31
  this.serveSameOrigin = false;
31
32
  }
32
33
  init() {
33
34
  const webviewExternalEndpoint = this.webviewExternalEndpoint();
34
- console.log(`Configuring to accept webviews on '${webviewExternalEndpoint}' hostname.`);
35
+ this.logger.info(`Configuring to accept webviews on '${webviewExternalEndpoint}' hostname.`);
35
36
  this.webviewExternalEndpointRegExp = new RegExp(webviewExternalEndpoint, 'i');
36
37
  }
37
38
  configure(app) {
@@ -95,6 +96,11 @@ tslib_1.__decorate([
95
96
  (0, inversify_1.inject)(backend_remote_service_1.BackendRemoteService),
96
97
  tslib_1.__metadata("design:type", backend_remote_service_1.BackendRemoteService)
97
98
  ], PluginApiContribution.prototype, "remoteService", void 0);
99
+ tslib_1.__decorate([
100
+ (0, inversify_1.inject)(core_1.ILogger),
101
+ (0, inversify_1.named)('plugin-ext:PluginApiContribution'),
102
+ tslib_1.__metadata("design:type", Object)
103
+ ], PluginApiContribution.prototype, "logger", void 0);
98
104
  tslib_1.__decorate([
99
105
  (0, inversify_1.postConstruct)(),
100
106
  tslib_1.__metadata("design:type", Function),
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-service.js","sourceRoot":"","sources":["../../../src/main/node/plugin-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,6BAA6B;AAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,sDAAsD;AAEtD,4DAAiF;AACjF,iEAAqE;AACrE,+FAA4F;AAG5F,uFAAmF;AACnF,+FAA0F;AAGnF,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QAIO,oBAAe,GAAY,KAAK,CAAC;IAkE/C,CAAC;IAzDa,IAAI;QACV,MAAM,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,sCAAsC,uBAAuB,aAAa,CAAC,CAAC;QACxF,IAAI,CAAC,6BAA6B,GAAG,IAAI,MAAM,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;IAClF,CAAC;IAED,SAAS,CAAC,GAAwB;QAC9B,MAAM,UAAU,GAAG,OAAO,EAAE,CAAC;QAC7B,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACpH,IAAI,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,EAAE,CAAC;YACtC,kGAAkG;YAClG,6GAA6G;YAC7G,wDAAwD;YACxD,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,6BAA6B,EAAE,UAAU,CAAC,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;IAED,cAAc,CAAC,OAA6B;QACxC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAClD,IAAI,IAAwB,CAAC;YAC7B,IAAI,CAAC;gBACD,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;YAChD,CAAC;YAAC,MAAM,CAAC;gBACL,IAAI,GAAG,SAAS,CAAC;YACrB,CAAC;YACD,IAAI,IAAI,IAAI,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxD,iDAAiD;gBACjD,OAAO,KAAK,CAAC;YACjB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,8BAA8B;QACpC,IAAI,eAAe,CAAC;QACpB,IAAI,yBAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;YAC5B,eAAe,GAAG,0CAAuB,CAAC,cAAc,CAAC;QAC7D,CAAC;aAAM,CAAC;YACJ,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,0CAAuB,CAAC,OAAO,CAAC,IAAI,0CAAuB,CAAC,cAAc,CAAC;QAC7G,CAAC;QACD,IAAI,eAAe,KAAK,cAAc,EAAE,CAAC;YACrC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAChC,CAAC;QACD,OAAO,eAAe,CAAC;IAC3B,CAAC;IAED;;OAEG;IACO,uBAAuB;QAC7B,OAAO,IAAI,IAAI,CAAC,8BAA8B,EAAE;aAC3C,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;aACrB,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC;aACzB,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC;IAC1C,CAAC;CACJ,CAAA;AAtEY,sDAAqB;AAOX;IADlB,IAAA,kBAAM,EAAC,wCAAkB,CAAC;sCACY,wCAAkB;iEAAC;AAGvC;IADlB,IAAA,kBAAM,EAAC,6CAAoB,CAAC;sCACK,6CAAoB;4DAAC;AAG7C;IADT,IAAA,yBAAa,GAAE;;;;iDAKf;gCAjBQ,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAsEjC"}
1
+ {"version":3,"file":"plugin-service.js","sourceRoot":"","sources":["../../../src/main/node/plugin-service.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,11 @@
1
- import { Emitter, Event } from '@theia/core';
1
+ import { Emitter, Event, ILogger } from '@theia/core';
2
2
  import { PluginIdentifiers } from '../../common';
3
3
  import { SettingService } from '@theia/core/lib/node';
4
4
  import { Deferred } from '@theia/core/lib/common/promise-util';
5
5
  export declare class PluginUninstallationManager {
6
6
  static DISABLED_PLUGINS: string;
7
7
  protected readonly settingService: SettingService;
8
+ protected readonly logger: ILogger;
8
9
  protected readonly onDidChangeUninstalledPluginsEmitter: Emitter<readonly `${string}.${string}@${string}`[]>;
9
10
  onDidChangeUninstalledPlugins: Event<readonly PluginIdentifiers.VersionedId[]>;
10
11
  protected readonly onDidChangeDisabledPluginsEmitter: Emitter<readonly `${string}.${string}`[]>;
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-uninstallation-manager.d.ts","sourceRoot":"","sources":["../../../src/main/node/plugin-uninstallation-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,qBACa,2BAA2B;IACpC,MAAM,CAAC,gBAAgB,SAAsC;IAG7D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,oCAAoC,sDAA2D;IAClH,6BAA6B,EAAE,KAAK,CAAC,SAAS,iBAAiB,CAAC,WAAW,EAAE,CAAC,CAAmD;IAEjI,SAAS,CAAC,QAAQ,CAAC,iCAAiC,4CAA6D;IACjH,0BAA0B,EAAE,KAAK,CAAC,SAAS,iBAAiB,CAAC,aAAa,EAAE,CAAC,CAAgD;IAE7H,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAa;IAC7E,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAa;IAE5E,SAAS,CAAC,QAAQ,CAAC,WAAW,iBAAwB;IAGtD,IAAI,IAAI,IAAI;cAII,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAYrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,iBAAiB,CAAC,GAAG,SAAS,EAAE,iBAAiB,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAelF,eAAe,CAAC,GAAG,SAAS,EAAE,iBAAiB,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAWtF,aAAa,CAAC,QAAQ,EAAE,iBAAiB,CAAC,WAAW,GAAG,OAAO;IAI/D,uBAAuB,IAAI,SAAS,iBAAiB,CAAC,WAAW,EAAE;IAI7D,cAAc,CAAC,GAAG,SAAS,EAAE,iBAAiB,CAAC,aAAa,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBjF,aAAa,CAAC,GAAG,SAAS,EAAE,iBAAiB,CAAC,aAAa,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAahF,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvE,oBAAoB,IAAI,OAAO,CAAC,SAAS,iBAAiB,CAAC,aAAa,EAAE,CAAC;CAIpF"}
1
+ {"version":3,"file":"plugin-uninstallation-manager.d.ts","sourceRoot":"","sources":["../../../src/main/node/plugin-uninstallation-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,qBACa,2BAA2B;IACpC,MAAM,CAAC,gBAAgB,SAAsC;IAG7D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,oCAAoC,sDAA2D;IAClH,6BAA6B,EAAE,KAAK,CAAC,SAAS,iBAAiB,CAAC,WAAW,EAAE,CAAC,CAAmD;IAEjI,SAAS,CAAC,QAAQ,CAAC,iCAAiC,4CAA6D;IACjH,0BAA0B,EAAE,KAAK,CAAC,SAAS,iBAAiB,CAAC,aAAa,EAAE,CAAC,CAAgD;IAE7H,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAa;IAC7E,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAa;IAE5E,SAAS,CAAC,QAAQ,CAAC,WAAW,iBAAwB;IAGtD,IAAI,IAAI,IAAI;cAII,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAYrB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/B,iBAAiB,CAAC,GAAG,SAAS,EAAE,iBAAiB,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAelF,eAAe,CAAC,GAAG,SAAS,EAAE,iBAAiB,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAWtF,aAAa,CAAC,QAAQ,EAAE,iBAAiB,CAAC,WAAW,GAAG,OAAO;IAI/D,uBAAuB,IAAI,SAAS,iBAAiB,CAAC,WAAW,EAAE;IAI7D,cAAc,CAAC,GAAG,SAAS,EAAE,iBAAiB,CAAC,aAAa,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBjF,aAAa,CAAC,GAAG,SAAS,EAAE,iBAAiB,CAAC,aAAa,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAahF,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvE,oBAAoB,IAAI,OAAO,CAAC,SAAS,iBAAiB,CAAC,aAAa,EAAE,CAAC;CAIpF"}
@@ -45,7 +45,7 @@ let PluginUninstallationManager = class PluginUninstallationManager {
45
45
  }
46
46
  catch (e) {
47
47
  // settings may be corrupt; just carry on
48
- console.warn(e);
48
+ this.logger.warn(e);
49
49
  }
50
50
  }
51
51
  async save() {
@@ -122,6 +122,11 @@ tslib_1.__decorate([
122
122
  (0, inversify_1.inject)(node_1.SettingService),
123
123
  tslib_1.__metadata("design:type", Object)
124
124
  ], PluginUninstallationManager.prototype, "settingService", void 0);
125
+ tslib_1.__decorate([
126
+ (0, inversify_1.inject)(core_1.ILogger),
127
+ (0, inversify_1.named)('plugin-ext:PluginUninstallationManager'),
128
+ tslib_1.__metadata("design:type", Object)
129
+ ], PluginUninstallationManager.prototype, "logger", void 0);
125
130
  tslib_1.__decorate([
126
131
  (0, inversify_1.postConstruct)(),
127
132
  tslib_1.__metadata("design:type", Function),
@@ -1 +1 @@
1
- {"version":3,"file":"plugin-uninstallation-manager.js","sourceRoot":"","sources":["../../../src/main/node/plugin-uninstallation-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugin-uninstallation-manager.js","sourceRoot":"","sources":["../../../src/main/node/plugin-uninstallation-manager.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { KeysToAnyValues, KeysToKeysToAnyValue } from '../../common/types';
2
2
  import { PluginStorageKind } from '../../common';
3
+ import { ILogger } from '@theia/core';
3
4
  export interface Store {
4
5
  fsPath: string;
5
6
  values: KeysToKeysToAnyValue;
@@ -12,6 +13,7 @@ export declare class PluginsKeyValueStorage {
12
13
  private pluginPathsService;
13
14
  private envServer;
14
15
  private fsLocking;
16
+ protected readonly logger: ILogger;
15
17
  protected init(): void;
16
18
  set(key: string, value: KeysToAnyValues, kind: PluginStorageKind): Promise<boolean>;
17
19
  get(key: string, kind: PluginStorageKind): Promise<KeysToAnyValues>;
@@ -1 +1 @@
1
- {"version":3,"file":"plugins-key-value-storage.d.ts","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,WAAW,KAAK;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,oBAAoB,CAAA;CAC/B;AAED,qBACa,sBAAsB;IAE/B,OAAO,CAAC,MAAM,CAA8C;IAC5D,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAE3C,OAAO,CAAC,sBAAsB,CAAsC;IAGpE,OAAO,CAAC,kBAAkB,CAAqB;IAG/C,OAAO,CAAC,SAAS,CAAqB;IAGtC,OAAO,CAAC,SAAS,CAAoB;IAGrC,SAAS,CAAC,IAAI,IAAI,IAAI;IAShB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAenF,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAKnE,MAAM,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,CAAC;YAKtD,iBAAiB;YAOjB,eAAe;YAUf,QAAQ;IAOtB,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,mBAAmB;YAKb,WAAW;YAUX,YAAY;YAYZ,WAAW;IAKzB,OAAO,CAAC,OAAO;CAIlB"}
1
+ {"version":3,"file":"plugins-key-value-storage.d.ts","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,KAAK;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,oBAAoB,CAAA;CAC/B;AAED,qBACa,sBAAsB;IAE/B,OAAO,CAAC,MAAM,CAA8C;IAC5D,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAE3C,OAAO,CAAC,sBAAsB,CAAsC;IAGpE,OAAO,CAAC,kBAAkB,CAAqB;IAG/C,OAAO,CAAC,SAAS,CAAqB;IAGtC,OAAO,CAAC,SAAS,CAAoB;IAGrC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,IAAI,IAAI,IAAI;IAShB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAenF,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAKnE,MAAM,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,CAAC;YAKtD,iBAAiB;YAOjB,eAAe;YAUf,QAAQ;IAOtB,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,mBAAmB;YAKb,WAAW;YAUX,YAAY;YAYZ,WAAW;IAKzB,OAAO,CAAC,OAAO;CAIlB"}
@@ -26,6 +26,7 @@ const promise_util_1 = require("@theia/core/lib/common/promise-util");
26
26
  const env_variables_1 = require("@theia/core/lib/common/env-variables");
27
27
  const const_1 = require("./paths/const");
28
28
  const plugin_paths_protocol_1 = require("../common/plugin-paths-protocol");
29
+ const core_1 = require("@theia/core");
29
30
  let PluginsKeyValueStorage = class PluginsKeyValueStorage {
30
31
  constructor() {
31
32
  this.stores = Object.create(null);
@@ -34,7 +35,7 @@ let PluginsKeyValueStorage = class PluginsKeyValueStorage {
34
35
  }
35
36
  init() {
36
37
  this.deferredGlobalDataPath.resolve(this.getGlobalDataPath().catch(error => {
37
- console.error('Failed to initialize global state path:', error);
38
+ this.logger.error('Failed to initialize global state path:', error);
38
39
  return undefined;
39
40
  }));
40
41
  process.once('beforeExit', () => this.dispose());
@@ -43,7 +44,7 @@ let PluginsKeyValueStorage = class PluginsKeyValueStorage {
43
44
  async set(key, value, kind) {
44
45
  const store = await this.getStore(kind);
45
46
  if (!store) {
46
- console.warn('Cannot save data: no opened workspace');
47
+ this.logger.warn('Cannot save data: no opened workspace');
47
48
  return false;
48
49
  }
49
50
  if (value === undefined || Object.keys(value).length === 0) {
@@ -118,7 +119,7 @@ let PluginsKeyValueStorage = class PluginsKeyValueStorage {
118
119
  return await fs.readJSON(pathToFile);
119
120
  }
120
121
  catch (error) {
121
- console.error('Failed to parse data from "', pathToFile, '". Reason:', error);
122
+ this.logger.error('Failed to parse data from "', pathToFile, '". Reason:', error);
122
123
  return {};
123
124
  }
124
125
  }
@@ -144,6 +145,11 @@ tslib_1.__decorate([
144
145
  (0, inversify_1.inject)(node_1.FileSystemLocking),
145
146
  tslib_1.__metadata("design:type", Object)
146
147
  ], PluginsKeyValueStorage.prototype, "fsLocking", void 0);
148
+ tslib_1.__decorate([
149
+ (0, inversify_1.inject)(core_1.ILogger),
150
+ (0, inversify_1.named)('plugin-ext:PluginsKeyValueStorage'),
151
+ tslib_1.__metadata("design:type", Object)
152
+ ], PluginsKeyValueStorage.prototype, "logger", void 0);
147
153
  tslib_1.__decorate([
148
154
  (0, inversify_1.postConstruct)(),
149
155
  tslib_1.__metadata("design:type", Function),
@@ -1 +1 @@
1
- {"version":3,"file":"plugins-key-value-storage.js","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"plugins-key-value-storage.js","sourceRoot":"","sources":["../../../src/main/node/plugins-key-value-storage.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,7 @@
1
1
  import { PluginDeployerResolver, PluginDeployerResolverContext } from '../../../common/plugin-protocol';
2
+ import { ILogger } from '@theia/core';
2
3
  export declare abstract class LocalPluginDeployerResolver implements PluginDeployerResolver {
4
+ protected readonly logger: ILogger;
3
5
  resolve(pluginResolverContext: PluginDeployerResolverContext): Promise<void>;
4
6
  accept(pluginId: string): boolean;
5
7
  protected abstract get supportedScheme(): string;
@@ -1 +1 @@
1
- {"version":3,"file":"local-plugin-deployer-resolver.d.ts","sourceRoot":"","sources":["../../../../src/main/node/resolvers/local-plugin-deployer-resolver.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAMxG,8BACsB,2BAA4B,YAAW,sBAAsB;IACzE,OAAO,CAAC,qBAAqB,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlF,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIjC,SAAS,CAAC,QAAQ,KAAK,eAAe,IAAI,MAAM,CAAC;IAEjD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,qBAAqB,EAAE,6BAA6B,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAEjH,sBAAsB;CAevC"}
1
+ {"version":3,"file":"local-plugin-deployer-resolver.d.ts","sourceRoot":"","sources":["../../../../src/main/node/resolvers/local-plugin-deployer-resolver.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAKxG,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,8BACsB,2BAA4B,YAAW,sBAAsB;IAG/E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAE7B,OAAO,CAAC,qBAAqB,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlF,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIjC,SAAS,CAAC,QAAQ,KAAK,eAAe,IAAI,MAAM,CAAC;IAEjD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,qBAAqB,EAAE,6BAA6B,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAEjH,sBAAsB;CAevC"}
@@ -22,6 +22,7 @@ const fs = require("@theia/core/shared/fs-extra");
22
22
  const path = require("path");
23
23
  const node_1 = require("@theia/core/lib/node");
24
24
  const uri_1 = require("@theia/core/lib/common/uri");
25
+ const core_1 = require("@theia/core");
25
26
  let LocalPluginDeployerResolver = class LocalPluginDeployerResolver {
26
27
  async resolve(pluginResolverContext) {
27
28
  const localPath = await this.resolveLocalPluginPath(pluginResolverContext, this.supportedScheme);
@@ -42,13 +43,18 @@ let LocalPluginDeployerResolver = class LocalPluginDeployerResolver {
42
43
  fsPath = path.resolve(process.cwd(), fsPath);
43
44
  }
44
45
  if (!await fs.pathExists(fsPath)) {
45
- console.warn(`The local plugin referenced by ${pluginResolverContext.getOriginId()} does not exist.`);
46
+ this.logger.warn(`The local plugin referenced by ${pluginResolverContext.getOriginId()} does not exist.`);
46
47
  return null;
47
48
  }
48
49
  return fsPath;
49
50
  }
50
51
  };
51
52
  exports.LocalPluginDeployerResolver = LocalPluginDeployerResolver;
53
+ tslib_1.__decorate([
54
+ (0, inversify_1.inject)(core_1.ILogger),
55
+ (0, inversify_1.named)('plugin-ext:LocalPluginDeployerResolver'),
56
+ tslib_1.__metadata("design:type", Object)
57
+ ], LocalPluginDeployerResolver.prototype, "logger", void 0);
52
58
  exports.LocalPluginDeployerResolver = LocalPluginDeployerResolver = tslib_1.__decorate([
53
59
  (0, inversify_1.injectable)()
54
60
  ], LocalPluginDeployerResolver);
@@ -1 +1 @@
1
- {"version":3,"file":"local-plugin-deployer-resolver.js","sourceRoot":"","sources":["../../../../src/main/node/resolvers/local-plugin-deployer-resolver.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAA0D;AAE1D,kDAAkD;AAClD,6BAA6B;AAC7B,+CAA+C;AAC/C,oDAA6C;AAGtC,IAAe,2BAA2B,GAA1C,MAAe,2BAA2B;IAC7C,KAAK,CAAC,OAAO,CAAC,qBAAoD;QAC9D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACjG,IAAI,SAAS,EAAE,CAAC;YACZ,MAAM,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IAED,MAAM,CAAC,QAAgB;QACnB,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACrD,CAAC;IAMO,KAAK,CAAC,sBAAsB,CAAC,qBAAoD,EAAE,cAAsB;QAC7G,MAAM,QAAQ,GAAG,IAAI,aAAG,CAAC,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC;QAC9D,IAAI,QAAQ,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,MAAM,GAAG,cAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,kCAAkC,qBAAqB,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;YACtG,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AA/BqB,kEAA2B;sCAA3B,2BAA2B;IADhD,IAAA,sBAAU,GAAE;GACS,2BAA2B,CA+BhD"}
1
+ {"version":3,"file":"local-plugin-deployer-resolver.js","sourceRoot":"","sources":["../../../../src/main/node/resolvers/local-plugin-deployer-resolver.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAyE;AAEzE,kDAAkD;AAClD,6BAA6B;AAC7B,+CAA+C;AAC/C,oDAA6C;AAC7C,sCAAsC;AAG/B,IAAe,2BAA2B,GAA1C,MAAe,2BAA2B;IAK7C,KAAK,CAAC,OAAO,CAAC,qBAAoD;QAC9D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;QACjG,IAAI,SAAS,EAAE,CAAC;YACZ,MAAM,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IAED,MAAM,CAAC,QAAgB;QACnB,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACrD,CAAC;IAMO,KAAK,CAAC,sBAAsB,CAAC,qBAAoD,EAAE,cAAsB;QAC7G,MAAM,QAAQ,GAAG,IAAI,aAAG,CAAC,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC;QAC9D,IAAI,QAAQ,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,MAAM,GAAG,cAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,qBAAqB,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;YAC1G,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AAnCqB,kEAA2B;AAG1B;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,wCAAwC,CAAC;;2DAC9B;sCAHjB,2BAA2B;IADhD,IAAA,sBAAU,GAAE;GACS,2BAA2B,CAmChD"}
@@ -1,5 +1,7 @@
1
1
  import { BackendApplicationContribution } from '@theia/core/lib/node';
2
+ import { ILogger } from '@theia/core';
2
3
  export declare class WebviewBackendSecurityWarnings implements BackendApplicationContribution {
4
+ protected readonly logger: ILogger;
3
5
  initialize(): void;
4
6
  protected checkHostPattern(): Promise<void>;
5
7
  }
@@ -1 +1 @@
1
- {"version":3,"file":"webview-backend-security-warnings.d.ts","sourceRoot":"","sources":["../../../src/main/node/webview-backend-security-warnings.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAKtE,qBACa,8BAA+B,YAAW,8BAA8B;IAEjF,UAAU,IAAI,IAAI;cAIF,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBpD"}
1
+ {"version":3,"file":"webview-backend-security-warnings.d.ts","sourceRoot":"","sources":["../../../src/main/node/webview-backend-security-warnings.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AAItE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,8BAA+B,YAAW,8BAA8B;IAGjF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,UAAU,IAAI,IAAI;cAIF,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBpD"}
@@ -20,6 +20,7 @@ const tslib_1 = require("tslib");
20
20
  const backend_application_config_provider_1 = require("@theia/core/lib/node/backend-application-config-provider");
21
21
  const inversify_1 = require("@theia/core/shared/inversify");
22
22
  const webview_protocol_1 = require("../common/webview-protocol");
23
+ const core_1 = require("@theia/core");
23
24
  let WebviewBackendSecurityWarnings = class WebviewBackendSecurityWarnings {
24
25
  initialize() {
25
26
  this.checkHostPattern();
@@ -30,7 +31,7 @@ let WebviewBackendSecurityWarnings = class WebviewBackendSecurityWarnings {
30
31
  }
31
32
  const envHostPattern = process.env[webview_protocol_1.WebviewExternalEndpoint.pattern];
32
33
  if (envHostPattern && envHostPattern !== webview_protocol_1.WebviewExternalEndpoint.defaultPattern) {
33
- console.warn(`\
34
+ this.logger.warn(`\
34
35
  WEBVIEW SECURITY WARNING
35
36
 
36
37
  Changing the @theia/plugin-ext webview host pattern can lead to security vulnerabilities.
@@ -41,6 +42,11 @@ WEBVIEW SECURITY WARNING
41
42
  }
42
43
  };
43
44
  exports.WebviewBackendSecurityWarnings = WebviewBackendSecurityWarnings;
45
+ tslib_1.__decorate([
46
+ (0, inversify_1.inject)(core_1.ILogger),
47
+ (0, inversify_1.named)('plugin-ext:WebviewBackendSecurityWarnings'),
48
+ tslib_1.__metadata("design:type", Object)
49
+ ], WebviewBackendSecurityWarnings.prototype, "logger", void 0);
44
50
  exports.WebviewBackendSecurityWarnings = WebviewBackendSecurityWarnings = tslib_1.__decorate([
45
51
  (0, inversify_1.injectable)()
46
52
  ], WebviewBackendSecurityWarnings);
@@ -1 +1 @@
1
- {"version":3,"file":"webview-backend-security-warnings.js","sourceRoot":"","sources":["../../../src/main/node/webview-backend-security-warnings.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,kHAA4G;AAC5G,4DAA0D;AAC1D,iEAAqE;AAG9D,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAEvC,UAAU;QACN,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IAES,KAAK,CAAC,gBAAgB;QAC5B,IAAI,sEAAgC,CAAC,GAAG,EAAE,CAAC,sCAAsC,CAAC,KAAK,KAAK,EAAE,CAAC;YAC3F,OAAO;QACX,CAAC;QACD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,0CAAuB,CAAC,OAAO,CAAC,CAAC;QACpE,IAAI,cAAc,IAAI,cAAc,KAAK,0CAAuB,CAAC,cAAc,EAAE,CAAC;YAC9E,OAAO,CAAC,IAAI,CAAC;;;;4BAIG,cAAc;;CAEzC,CACY,CAAC;QACN,CAAC;IACL,CAAC;CACJ,CAAA;AAtBY,wEAA8B;yCAA9B,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CAsB1C"}
1
+ {"version":3,"file":"webview-backend-security-warnings.js","sourceRoot":"","sources":["../../../src/main/node/webview-backend-security-warnings.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,kHAA4G;AAC5G,4DAAyE;AACzE,iEAAqE;AACrE,sCAAsC;AAG/B,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAKvC,UAAU;QACN,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IAES,KAAK,CAAC,gBAAgB;QAC5B,IAAI,sEAAgC,CAAC,GAAG,EAAE,CAAC,sCAAsC,CAAC,KAAK,KAAK,EAAE,CAAC;YAC3F,OAAO;QACX,CAAC;QACD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,0CAAuB,CAAC,OAAO,CAAC,CAAC;QACpE,IAAI,cAAc,IAAI,cAAc,KAAK,0CAAuB,CAAC,cAAc,EAAE,CAAC;YAC9E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;;;;4BAID,cAAc;;CAEzC,CACY,CAAC;QACN,CAAC;IACL,CAAC;CACJ,CAAA;AAzBY,wEAA8B;AAGpB;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,2CAA2C,CAAC;;8DACjC;yCAH1B,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,CAyB1C"}
package/lib/plugin/scm.js CHANGED
@@ -456,7 +456,7 @@ function historyItemToDto(item) {
456
456
  authorIcon: item.authorIcon,
457
457
  displayId: item.displayId,
458
458
  timestamp: item.timestamp,
459
- tooltip: item.tooltip,
459
+ tooltip: Array.isArray(item.tooltip) ? [...item.tooltip] : item.tooltip,
460
460
  statistics: item.statistics ? {
461
461
  files: item.statistics.files,
462
462
  insertions: item.statistics.insertions,