From 53cbf40759a295c3b399806f37dd40e79f3e15e9 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Thu, 2 Feb 2017 14:39:31 -0800 Subject: [PATCH] Consolidate under single 'welcome' folder (fixes #19065) --- build/gulpfile.vscode.js | 4 ++-- src/vs/workbench/electron-browser/workbench.main.ts | 8 ++++---- .../electron-browser/gettingStarted.contribution.ts | 0 .../electron-browser/gettingStarted.ts | 0 .../test/common/gettingStarted.test.ts | 0 .../overlay}/browser/media/commandpalette-dark.svg | 0 .../overlay}/browser/media/commandpalette.svg | 0 .../overlay}/browser/welcomeOverlay.css | 0 .../overlay}/browser/welcomeOverlay.ts | 0 .../page}/electron-browser/vs_code_welcome_page.html | 0 .../electron-browser/welcomePage.contribution.ts | 2 +- .../page}/electron-browser/welcomePage.css | 2 +- .../page}/electron-browser/welcomePage.ts | 2 +- .../electron-browser/editor/editorWalkThrough.ts | 2 +- .../editor/vs_code_editor_walkthrough.md | 0 .../electron-browser/walkThrough.contribution.ts | 12 ++++++------ .../electron-browser/walkThroughActions.ts | 2 +- .../walkThrough/electron-browser/walkThroughPart.css | 2 +- .../walkThrough/electron-browser/walkThroughPart.ts | 2 +- .../walkThrough/node/walkThroughContentProvider.ts | 0 .../walkThrough/node/walkThroughInput.ts | 0 21 files changed, 19 insertions(+), 19 deletions(-) rename src/vs/workbench/parts/welcome/{ => gettingStarted}/electron-browser/gettingStarted.contribution.ts (100%) rename src/vs/workbench/parts/welcome/{ => gettingStarted}/electron-browser/gettingStarted.ts (100%) rename src/vs/workbench/parts/welcome/{ => gettingStarted}/test/common/gettingStarted.test.ts (100%) rename src/vs/workbench/parts/{welcomeOverlay => welcome/overlay}/browser/media/commandpalette-dark.svg (100%) rename src/vs/workbench/parts/{welcomeOverlay => welcome/overlay}/browser/media/commandpalette.svg (100%) rename src/vs/workbench/parts/{welcomeOverlay => welcome/overlay}/browser/welcomeOverlay.css (100%) rename src/vs/workbench/parts/{welcomeOverlay => welcome/overlay}/browser/welcomeOverlay.ts (100%) rename src/vs/workbench/parts/{welcomePage => welcome/page}/electron-browser/vs_code_welcome_page.html (100%) rename src/vs/workbench/parts/{welcomePage => welcome/page}/electron-browser/welcomePage.contribution.ts (96%) rename src/vs/workbench/parts/{welcomePage => welcome/page}/electron-browser/welcomePage.css (99%) rename src/vs/workbench/parts/{welcomePage => welcome/page}/electron-browser/welcomePage.ts (98%) rename src/vs/workbench/parts/{ => welcome}/walkThrough/electron-browser/editor/editorWalkThrough.ts (94%) rename src/vs/workbench/parts/{ => welcome}/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md (100%) rename src/vs/workbench/parts/{ => welcome}/walkThrough/electron-browser/walkThrough.contribution.ts (88%) rename src/vs/workbench/parts/{ => welcome}/walkThrough/electron-browser/walkThroughActions.ts (96%) rename src/vs/workbench/parts/{ => welcome}/walkThrough/electron-browser/walkThroughPart.css (98%) rename src/vs/workbench/parts/{ => welcome}/walkThrough/electron-browser/walkThroughPart.ts (99%) rename src/vs/workbench/parts/{ => welcome}/walkThrough/node/walkThroughContentProvider.ts (100%) rename src/vs/workbench/parts/{ => welcome}/walkThrough/node/walkThroughInput.ts (100%) diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 94e8775cf83..6e64eba2cf1 100644 --- a/build/gulpfile.vscode.js +++ b/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/**' diff --git a/src/vs/workbench/electron-browser/workbench.main.ts b/src/vs/workbench/electron-browser/workbench.main.ts index 7672f8b6fa6..e668e6e51c5 100644 --- a/src/vs/workbench/electron-browser/workbench.main.ts +++ b/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 diff --git a/src/vs/workbench/parts/welcome/electron-browser/gettingStarted.contribution.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts similarity index 100% rename from src/vs/workbench/parts/welcome/electron-browser/gettingStarted.contribution.ts rename to src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts diff --git a/src/vs/workbench/parts/welcome/electron-browser/gettingStarted.ts b/src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts similarity index 100% rename from src/vs/workbench/parts/welcome/electron-browser/gettingStarted.ts rename to src/vs/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.ts diff --git a/src/vs/workbench/parts/welcome/test/common/gettingStarted.test.ts b/src/vs/workbench/parts/welcome/gettingStarted/test/common/gettingStarted.test.ts similarity index 100% rename from src/vs/workbench/parts/welcome/test/common/gettingStarted.test.ts rename to src/vs/workbench/parts/welcome/gettingStarted/test/common/gettingStarted.test.ts diff --git a/src/vs/workbench/parts/welcomeOverlay/browser/media/commandpalette-dark.svg b/src/vs/workbench/parts/welcome/overlay/browser/media/commandpalette-dark.svg similarity index 100% rename from src/vs/workbench/parts/welcomeOverlay/browser/media/commandpalette-dark.svg rename to src/vs/workbench/parts/welcome/overlay/browser/media/commandpalette-dark.svg diff --git a/src/vs/workbench/parts/welcomeOverlay/browser/media/commandpalette.svg b/src/vs/workbench/parts/welcome/overlay/browser/media/commandpalette.svg similarity index 100% rename from src/vs/workbench/parts/welcomeOverlay/browser/media/commandpalette.svg rename to src/vs/workbench/parts/welcome/overlay/browser/media/commandpalette.svg diff --git a/src/vs/workbench/parts/welcomeOverlay/browser/welcomeOverlay.css b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css similarity index 100% rename from src/vs/workbench/parts/welcomeOverlay/browser/welcomeOverlay.css rename to src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.css diff --git a/src/vs/workbench/parts/welcomeOverlay/browser/welcomeOverlay.ts b/src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts similarity index 100% rename from src/vs/workbench/parts/welcomeOverlay/browser/welcomeOverlay.ts rename to src/vs/workbench/parts/welcome/overlay/browser/welcomeOverlay.ts diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/vs_code_welcome_page.html b/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.html similarity index 100% rename from src/vs/workbench/parts/welcomePage/electron-browser/vs_code_welcome_page.html rename to src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.html diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.contribution.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts similarity index 96% rename from src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.contribution.ts rename to src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution.ts index 2ec9ae0d454..8d44f983408 100644 --- a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.contribution.ts +++ b/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'; diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.css similarity index 99% rename from src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css rename to src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.css index 9a43d53fde3..312e2015e73 100644 --- a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css +++ b/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, diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts similarity index 98% rename from src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.ts rename to src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts index bc0d504d5a5..f6662e40fa2 100644 --- a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.ts +++ b/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'; diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts similarity index 94% rename from src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.ts rename to src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/editorWalkThrough.ts index 76b0e4000e2..e23ba8f9c0e 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/editor/editorWalkThrough.ts +++ b/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 { diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md similarity index 100% rename from src/vs/workbench/parts/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md rename to src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/walkThrough.contribution.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.ts similarity index 88% rename from src/vs/workbench/parts/walkThrough/electron-browser/walkThrough.contribution.ts rename to src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.contribution.ts index 239b3128637..727d2733367 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/walkThrough.contribution.ts +++ b/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(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)]); diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughActions.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts similarity index 96% rename from src/vs/workbench/parts/walkThrough/electron-browser/walkThroughActions.ts rename to src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughActions.ts index 67340901f67..4f09888babb 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughActions.ts +++ b/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 { diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.css similarity index 98% rename from src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css rename to src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.css index be87463c2d1..20c79500a4e 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css +++ b/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, diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts similarity index 99% rename from src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts rename to src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts index 4409c4ff430..cf7eb5a8492 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts +++ b/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'; diff --git a/src/vs/workbench/parts/walkThrough/node/walkThroughContentProvider.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts similarity index 100% rename from src/vs/workbench/parts/walkThrough/node/walkThroughContentProvider.ts rename to src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts diff --git a/src/vs/workbench/parts/walkThrough/node/walkThroughInput.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts similarity index 100% rename from src/vs/workbench/parts/walkThrough/node/walkThroughInput.ts rename to src/vs/workbench/parts/welcome/walkThrough/node/walkThroughInput.ts -- GitLab