@codingame/monaco-vscode-workspace-trust-service-override 4.4.1 → 4.5.0

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 (6) hide show
  1. package/package.json +10 -2
  2. package/vscode/src/vs/platform/workspace/common/workspaceTrust.js +16 -0
  3. package/vscode/src/vs/workbench/contrib/workspace/browser/workspace.contribution.js +31 -28
  4. package/vscode/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.js +20 -19
  5. package/workspaceTrust.js +1 -1
  6. package/override/vs/platform/dialogs/common/dialogs.js +0 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-workspace-trust-service-override",
3
- "version": "4.4.1",
3
+ "version": "4.5.0",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -17,7 +17,15 @@
17
17
  "main": "index.js",
18
18
  "module": "index.js",
19
19
  "types": "index.d.ts",
20
+ "exports": {
21
+ ".": {
22
+ "default": "./index.js"
23
+ },
24
+ "./vscode/*": {
25
+ "default": "./vscode/src/*.js"
26
+ }
27
+ },
20
28
  "dependencies": {
21
- "vscode": "npm:@codingame/monaco-vscode-api@4.4.1"
29
+ "vscode": "npm:@codingame/monaco-vscode-api@4.5.0"
22
30
  }
23
31
  }
package/vscode/src/vs/platform/workspace/common/workspaceTrust.js ADDED
@@ -0,0 +1,16 @@
1
+ import { localizeWithPath } from 'vscode/vscode/vs/nls';
2
+
3
+ function workspaceTrustToString(trustState) {
4
+ if (trustState) {
5
+ return ( localizeWithPath('vs/platform/workspace/common/workspaceTrust', 'trusted', "Trusted"));
6
+ }
7
+ else {
8
+ return ( localizeWithPath(
9
+ 'vs/platform/workspace/common/workspaceTrust',
10
+ 'untrusted',
11
+ "Restricted Mode"
12
+ ));
13
+ }
14
+ }
15
+
16
+ export { workspaceTrustToString };
package/vscode/src/vs/workbench/contrib/workspace/browser/workspace.contribution.js CHANGED
@@ -5,46 +5,49 @@ import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/life
5
5
  import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
6
6
  import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
7
7
  import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
8
- import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
8
+ import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
9
9
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
10
- import { Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
10
+ import 'vscode/vscode/vs/platform/notification/common/notification';
11
11
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
12
- import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService, workspaceTrustToString } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
12
+ import { workspaceTrustToString } from '../../../../platform/workspace/common/workspaceTrust.js';
13
+ import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
13
14
  import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
14
15
  import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
15
- import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
16
- import { IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
17
- import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
18
- import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
16
+ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
17
+ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
18
+ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
19
+ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
20
+ import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
19
21
  import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
20
- import { WorkspaceTrustEditor, shieldIcon } from './workspaceTrustEditor.js';
22
+ import { shieldIcon, WorkspaceTrustEditor } from './workspaceTrustEditor.js';
21
23
  import { WorkspaceTrustEditorInput } from '../../../services/workspaces/browser/workspaceTrustEditorInput.js';
22
- import { WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WORKSPACE_TRUST_BANNER, WORKSPACE_TRUST_UNTRUSTED_FILES, WORKSPACE_TRUST_EMPTY_WINDOW } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceTrust';
24
+ import { WORKSPACE_TRUST_STARTUP_PROMPT, WORKSPACE_TRUST_BANNER, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_UNTRUSTED_FILES, WORKSPACE_TRUST_EMPTY_WINDOW } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceTrust';
23
25
  import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
24
- import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
25
- import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, IWorkspaceContextService, isEmptyWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
26
+ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
27
+ import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, isEmptyWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
28
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
26
29
  import { resolve, dirname as dirname$1 } from 'vscode/vscode/vs/base/common/path';
27
- import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
30
+ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
28
31
  import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
29
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
30
- import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
31
- import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService';
32
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
33
+ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
34
+ import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService.service';
32
35
  import { isVirtualWorkspace } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
33
36
  import { LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
34
- import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
37
+ import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
35
38
  import { WORKSPACE_TRUST_SETTING_TAG } from 'vscode/vscode/vs/workbench/contrib/preferences/common/preferences';
36
- import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
37
- import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
38
- import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
39
- import { MANAGE_TRUST_COMMAND_ID, WorkspaceTrustContext } from 'vscode/vscode/vs/workbench/contrib/workspace/common/workspace';
39
+ import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
40
+ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
41
+ import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
42
+ import { WorkspaceTrustContext, MANAGE_TRUST_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/workspace/common/workspace';
40
43
  import { isWeb } from 'vscode/vscode/vs/base/common/platform';
41
- import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
44
+ import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
42
45
  import { securityConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
43
46
  import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
44
47
  import { URI } from 'vscode/vscode/vs/base/common/uri';
45
- import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
46
- import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
47
- import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
48
+ import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
49
+ import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
50
+ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
48
51
 
49
52
  const BANNER_RESTRICTED_MODE = 'workbench.banner.restrictedMode';
50
53
  const STARTUP_PROMPT_SHOWN_KEY = 'workspace.trust.startupPrompt.shown';
@@ -101,7 +104,7 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
101
104
  ))
102
105
  ];
103
106
  await this.dialogService.prompt({
104
- type: Severity.Info,
107
+ type: Severity$1.Info,
105
108
  message: this.workspaceContextService.getWorkbenchState() !== 1 ?
106
109
  ( localizeWithPath(
107
110
  'vs/workbench/contrib/workspace/browser/workspace.contribution',
@@ -191,7 +194,7 @@ let WorkspaceTrustRequestHandler = class WorkspaceTrustRequestHandler extends Di
191
194
  )), type: 'Cancel' });
192
195
  }
193
196
  const { result } = await this.dialogService.prompt({
194
- type: Severity.Info,
197
+ type: Severity$1.Info,
195
198
  message,
196
199
  custom: {
197
200
  icon: Codicon.shield,
@@ -299,7 +302,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
299
302
  const addedFoldersTrustInfo = await Promise.all(( e.changes.added.map(folder => this.workspaceTrustManagementService.getUriTrustInfo(folder.uri))));
300
303
  if (!( addedFoldersTrustInfo.map(info => info.trusted)).every(trusted => trusted)) {
301
304
  const { confirmed } = await this.dialogService.confirm({
302
- type: Severity.Info,
305
+ type: Severity$1.Info,
303
306
  message: ( localizeWithPath(
304
307
  'vs/workbench/contrib/workspace/browser/workspace.contribution',
305
308
  'addWorkspaceFolderMessage',
@@ -427,7 +430,7 @@ let WorkspaceTrustUXHandler = class WorkspaceTrustUXHandler extends Disposable {
427
430
  }
428
431
  async doShowModal(question, trustedOption, untrustedOption, markdownStrings, trustParentString) {
429
432
  await this.dialogService.prompt({
430
- type: Severity.Info,
433
+ type: Severity$1.Info,
431
434
  message: question,
432
435
  checkbox: trustParentString ? {
433
436
  label: trustParentString
package/vscode/src/vs/workbench/contrib/workspace/browser/workspaceTrustEditor.js CHANGED
@@ -9,22 +9,22 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
9
9
  import { debounce } from 'vscode/vscode/vs/base/common/decorators';
10
10
  import { Emitter } from 'vscode/vscode/vs/base/common/event';
11
11
  import { normalizeDriveLetter } from 'vscode/vscode/vs/base/common/labels';
12
- import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
12
+ import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
13
13
  import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
14
14
  import { Schemas } from 'vscode/vscode/vs/base/common/network';
15
15
  import { URI } from 'vscode/vscode/vs/base/common/uri';
16
16
  import { localizeWithPath } from 'vscode/vscode/vs/nls';
17
17
  import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
18
- import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
19
- import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
18
+ import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
19
+ import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
20
20
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
21
- import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
21
+ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
22
22
  import { WorkbenchTable } from 'vscode/vscode/vs/platform/list/browser/listService';
23
23
  import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
24
24
  import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
25
- import { isVirtualWorkspace, isVirtualResource } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
26
- import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
27
- import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
25
+ import { isVirtualResource, isVirtualWorkspace } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
26
+ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
27
+ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
28
28
  import { asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
29
29
  import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
30
30
  import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -36,28 +36,29 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
36
36
  import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
37
37
  import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
38
38
  import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
39
- import { IWorkspaceContextService, toWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
40
- import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
39
+ import { toWorkspaceIdentifier } from 'vscode/vscode/vs/platform/workspace/common/workspace';
40
+ import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
41
+ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
41
42
  import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
42
- import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
43
+ import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
43
44
  import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
44
45
  import { debugIconStartForeground } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugColors';
45
- import { LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
46
- import { IWorkbenchConfigurationService } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
47
- import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService';
48
- import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
46
+ import { LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
47
+ import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions.service';
48
+ import { IWorkbenchConfigurationService } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration.service';
49
+ import { IExtensionManifestPropertiesService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service';
50
+ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
49
51
  import { getExtensionDependencies } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
50
- import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
52
+ import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
51
53
  import { posix, win32 } from 'vscode/vscode/vs/base/common/path';
52
54
  import { hasDriveLetter, toSlashes } from 'vscode/vscode/vs/base/common/extpath';
53
55
  import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
54
- import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
56
+ import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
55
57
  import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
56
- import { defaultInputBoxStyles, defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
58
+ import { defaultButtonStyles, defaultInputBoxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
57
59
  import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
58
- import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
60
+ import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
59
61
  import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
60
- import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
61
62
 
62
63
  var TrustedUriActionsColumnRenderer_1, TrustedUriPathColumnRenderer_1, TrustedUriHostColumnRenderer_1, WorkspaceTrustEditor_1;
63
64
  const shieldIcon = registerIcon('workspace-trust-banner', Codicon.shield, ( localizeWithPath(
package/workspaceTrust.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
2
- import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
2
+ import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
3
3
  import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService, WorkspaceTrustRequestService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceTrust';
4
4
  import './vscode/src/vs/workbench/contrib/workspace/browser/workspace.contribution.js';
5
5
 
package/override/vs/platform/dialogs/common/dialogs.js DELETED
@@ -1,10 +0,0 @@
1
- export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
2
-
3
- var ConfirmResult;
4
- ( (function(ConfirmResult) {
5
- ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";
6
- ConfirmResult[ConfirmResult["DONT_SAVE"] = 1] = "DONT_SAVE";
7
- ConfirmResult[ConfirmResult["CANCEL"] = 2] = "CANCEL";
8
- })(ConfirmResult || (ConfirmResult = {})));
9
-
10
- export { ConfirmResult };