Consolidate under single 'welcome' folder (fixes #19065)

build/gulpfile.vscode.js

@@ -71,8 +71,8 @@ const vscodeResources = [
 	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/parts/tasks/**/*.json',
 	'out-build/vs/workbench/parts/terminal/electron-browser/terminalProcess.js',
-	'out-build/vs/workbench/parts/walkThrough/**/*.md',
-	'out-build/vs/workbench/parts/welcomePage/**/*.html',
+	'out-build/vs/workbench/parts/welcome/walkThrough/**/*.md',
+	'out-build/vs/workbench/parts/welcome/page/**/*.html',
 	'out-build/vs/workbench/services/files/**/*.exe',
 	'out-build/vs/workbench/services/files/**/*.md',
 	'!**/test/**'

src/vs/workbench/electron-browser/workbench.main.ts

@@ -60,13 +60,13 @@ import 'vs/workbench/parts/markers/browser/markersPanel'; // can be packaged sep
 
 import 'vs/workbench/parts/html/browser/html.contribution';
 
-import 'vs/workbench/parts/walkThrough/electron-browser/walkThrough.contribution';
+import 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution';
 
 import 'vs/workbench/parts/extensions/electron-browser/extensions.contribution';
 import 'vs/workbench/parts/extensions/browser/extensionsQuickOpen';
 import 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet'; // can be packaged separately
 
-import 'vs/workbench/parts/welcomePage/electron-browser/welcomePage.contribution';
+import 'vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution';
 
 import 'vs/workbench/parts/explorers/browser/treeExplorer.contribution';
 import 'vs/workbench/parts/explorers/browser/treeExplorerViewlet'; // can be packaged separately
@@ -98,7 +98,7 @@ import 'vs/workbench/parts/themes/electron-browser/themes.contribution';
 
 import 'vs/workbench/parts/feedback/electron-browser/feedback.contribution';
 
-import 'vs/workbench/parts/welcome/electron-browser/gettingStarted.contribution';
+import 'vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.contribution';
 
 import 'vs/workbench/parts/update/electron-browser/update.contribution';
 
@@ -115,4 +115,4 @@ import 'vs/workbench/parts/themes/test/electron-browser/themes.test.contribution
 
 import 'vs/workbench/parts/watermark/electron-browser/watermark';
 
-import 'vs/workbench/parts/welcomeOverlay/browser/welcomeOverlay';
\ No newline at end of file
+import 'vs/workbench/parts/welcome/overlay/browser/welcomeOverlay';
\ No newline at end of file

src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.contribution.ts → src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts

@@ -7,7 +7,7 @@
 import { localize } from 'vs/nls';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/platform';
-import { WelcomePageContribution, WelcomePageAction } from 'vs/workbench/parts/welcomePage/electron-browser/welcomePage';
+import { WelcomePageContribution, WelcomePageAction } from 'vs/workbench/parts/welcome/page/electron-browser/welcomePage';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actionRegistry';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';

src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css → src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.css

@@ -260,7 +260,7 @@
 
 .file-icons-enabled .show-file-icons .vs_code_welcome_page\.html-name-file-icon.html-ext-file-icon.html-lang-file-icon.file-icon::before {
 	content: ' ';
-	background-image: url('../../../../../../resources/code-icon.svg');
+	background-image: url('../../../../../../../resources/code-icon.svg');
 }
 
 .monaco-workbench > .part.editor > .content .welcomePage .mac-only,

src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.ts → src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts

@@ -9,7 +9,7 @@ import URI from 'vs/base/common/uri';
 import * as path from 'path';
 import * as platform from 'vs/base/common/platform';
 import * as strings from 'vs/base/common/strings';
-import { WalkThroughInput } from 'vs/workbench/parts/walkThrough/node/walkThroughInput';
+import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';

src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.ts → src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts

@@ -11,7 +11,7 @@ import { Action } from 'vs/base/common/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
-import { WalkThroughInput } from 'vs/workbench/parts/walkThrough/node/walkThroughInput';
+import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
 import { Schemas } from 'vs/base/common/network';
 
 export class EditorWalkThroughAction extends Action {

src/vs/workbench/parts/walkThrough/electron-browser/walkThrough.contribution.ts → src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.ts

@@ -5,11 +5,11 @@
 'use strict';
 
 import { localize } from 'vs/nls';
-import { WalkThroughInput } from 'vs/workbench/parts/walkThrough/node/walkThroughInput';
-import { WalkThroughPart, WALK_THROUGH_FOCUS } from 'vs/workbench/parts/walkThrough/electron-browser/walkThroughPart';
-import { WalkThroughArrowUpAction, WalkThroughArrowDownAction, WalkThroughPageUpAction, WalkThroughPageDownAction } from 'vs/workbench/parts/walkThrough/electron-browser/walkThroughActions';
-import { WalkThroughContentProvider, WalkThroughSnippetContentProvider } from 'vs/workbench/parts/walkThrough/node/walkThroughContentProvider';
-import { EditorWalkThroughAction } from 'vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough';
+import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
+import { WalkThroughPart, WALK_THROUGH_FOCUS } from 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart';
+import { WalkThroughArrowUpAction, WalkThroughArrowDownAction, WalkThroughPageUpAction, WalkThroughPageDownAction } from 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions';
+import { WalkThroughContentProvider, WalkThroughSnippetContentProvider } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider';
+import { EditorWalkThroughAction } from 'vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough';
 import { Registry } from 'vs/platform/platform';
 import { EditorDescriptor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor';
@@ -24,7 +24,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 Registry.as<IEditorRegistry>(EditorExtensions.Editors)
 	.registerEditor(new EditorDescriptor(WalkThroughPart.ID,
 		localize('walkThrough.editor.label', "Interactive Playground"),
-		'vs/workbench/parts/walkThrough/electron-browser/walkThroughPart',
+		'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart',
 		'WalkThroughPart'),
 	[new SyncDescriptor(WalkThroughInput)]);
 

src/vs/workbench/parts/walkThrough/electron-browser/walkThroughActions.ts → src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts

@@ -8,7 +8,7 @@ import { localize } from 'vs/nls';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { Action } from 'vs/base/common/actions';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { WalkThroughPart } from 'vs/workbench/parts/walkThrough/electron-browser/walkThroughPart';
+import { WalkThroughPart } from 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart';
 
 export class WalkThroughArrowUpAction extends Action {
 

src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css → src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.css

@@ -141,7 +141,7 @@
 
 .file-icons-enabled .show-file-icons .vs_code_editor_walkthrough\.md-name-file-icon.md-ext-file-icon.markdown-lang-file-icon.file-icon::before {
 	content: ' ';
-	background-image: url('../../../../../../resources/code-icon.svg');
+	background-image: url('../../../../../../../resources/code-icon.svg');
 }
 
 .monaco-workbench > .part.editor > .content .walkThroughContent .mac-only,

src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts → src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts

@@ -18,7 +18,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { WalkThroughInput } from 'vs/workbench/parts/walkThrough/node/walkThroughInput';
+import { WalkThroughInput } from 'vs/workbench/parts/welcome/walkThrough/node/walkThroughInput';
 import { IThemeService } from 'vs/workbench/services/themes/common/themeService';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { marked } from 'vs/base/common/marked/marked';