@codingame/monaco-vscode-debug-service-override 2.1.4 → 2.2.0-next.2

package/debug.js

@@ -8,7 +8,6 @@ import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/servic
 import { IExtensionHostDebugService } from 'vscode/vscode/vs/platform/debug/common/extensionHostDebug';
 import { BrowserExtensionHostDebugService } from './vscode/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.js';
 import { IDebugVisualizerService, DebugVisualizerService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers';
-import getServiceOverride$1 from '@codingame/monaco-vscode-layout-service-override';
 import './vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js';
 
 const original = DebugService.prototype['showError'];
@@ -17,7 +16,6 @@ DebugService.prototype['showError'] = function (message, errorActions) {
 };
 function getServiceOverride() {
     return {
-        ...getServiceOverride$1(),
         [( ILanguageFeaturesService.toString())]: new SyncDescriptor(LanguageFeaturesService, [], true),
         [( IDebugService.toString())]: new SyncDescriptor(DebugService, [], true),
         [( IConfigurationResolverService.toString())]: new SyncDescriptor(ConfigurationResolverService, [], true),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "2.1.4",
+  "version": "2.2.0-next.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.1.4",
-    "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-layout-service-override": "2.1.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.2",
+    "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.js

@@ -3,19 +3,23 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions, ViewContentGroups, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { OpenFileFolderAction, OpenFileAction, OpenFolderAction } from 'vscode/vscode/vs/workbench/browser/actions/workspaceActions';
+import { isMacintosh, isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { DEBUG_START_COMMAND_ID } from './debugCommands.js';
+import { DEBUG_START_COMMAND_ID, SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID } from './debugCommands.js';
 
 const debugStartLanguageKey = 'debugStartLanguage';
 const CONTEXT_DEBUG_START_LANGUAGE = ( new RawContextKey(debugStartLanguageKey, undefined));
@@ -89,6 +93,69 @@ WelcomeView = ( __decorate([
     ( __param(11, IStorageService)),
     ( __param(12, ITelemetryService))
 ], WelcomeView));
+const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
+viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
+    content: ( localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', {
+        key: 'openAFileWhichCanBeDebugged',
+        comment: [
+            'Please do not translate the word "command", it is part of our internal syntax which must not change',
+            '{Locked="](command:{0})"}'
+        ]
+    }, "[Open a file](command:{0}) which can be debugged or run.", (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFileAction.ID)),
+    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR.toNegated()))),
+    group: ViewContentGroups.Open,
+});
 let debugKeybindingLabel = '';
+viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
+    content: `[${( localizeWithPath(
+        'vs/workbench/contrib/debug/browser/welcomeView',
+        'runAndDebugAction',
+        "Run and Debug"
+    ))}${debugKeybindingLabel}](command:${DEBUG_START_COMMAND_ID})`,
+    when: CONTEXT_DEBUGGERS_AVAILABLE,
+    group: ViewContentGroups.Debug,
+    order: 1
+});
+viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
+    content: `[${( localizeWithPath(
+        'vs/workbench/contrib/debug/browser/welcomeView',
+        'detectThenRunAndDebug',
+        "Show all automatic debug configurations"
+    ))}](command:${SELECT_AND_START_ID}).`,
+    when: CONTEXT_DEBUGGERS_AVAILABLE,
+    group: ViewContentGroups.Debug,
+    order: 10
+});
+viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
+    content: ( localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', {
+        key: 'customizeRunAndDebug',
+        comment: [
+            'Please do not translate the word "command", it is part of our internal syntax which must not change',
+            '{Locked="](command:{0})"}'
+        ]
+    }, "To customize Run and Debug [create a launch.json file](command:{0}).", DEBUG_CONFIGURE_COMMAND_ID)),
+    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( WorkbenchStateContext.notEqualsTo('empty')))),
+    group: ViewContentGroups.Debug
+});
+viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
+    content: ( localizeWithPath('vs/workbench/contrib/debug/browser/welcomeView', {
+        key: 'customizeRunAndDebugOpenFolder',
+        comment: [
+            'Please do not translate the word "commmand", it is part of our internal syntax which must not change',
+            '{Locked="](command:{0})"}'
+        ]
+    }, "To customize Run and Debug, [open a folder](command:{0}) and create a launch.json file.", (isMacintosh && !isWeb) ? OpenFileFolderAction.ID : OpenFolderAction.ID)),
+    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( WorkbenchStateContext.isEqualTo('empty')))),
+    group: ViewContentGroups.Debug
+});
+viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {
+    content: ( localizeWithPath(
+        'vs/workbench/contrib/debug/browser/welcomeView',
+        'allDebuggersDisabled',
+        "All debug extensions are disabled. Enable a debug extension or install a new one from the Marketplace."
+    )),
+    when: ( CONTEXT_DEBUG_EXTENSION_AVAILABLE.toNegated()),
+    group: ViewContentGroups.Debug
+});
 
 export { WelcomeView };