Skip to content

Commit 94a2f52

Browse files
author
Benjamin Pasero
committed
debt - lift more things to common/browser namespace
1 parent 11f5408 commit 94a2f52

10 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎src/tsconfig.strictNullChecks.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"./vs/workbench/common/viewlet.ts",
139139
"./vs/workbench/common/views.ts",
140140
"./vs/workbench/contrib/backup/common/backupRestorer.ts",
141-
"./vs/workbench/contrib/cli/electron-browser/cli.contribution.ts",
141+
"./vs/workbench/contrib/cli/node/cli.contribution.ts",
142142
"./vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.ts",
143143
"./vs/workbench/contrib/codeEditor/browser/menuPreventer.ts",
144144
"./vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.ts",
@@ -206,12 +206,12 @@
206206
"./vs/workbench/contrib/files/browser/files.ts",
207207
"./vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.ts",
208208
"./vs/workbench/contrib/format/browser/format.contribution.ts",
209-
"./vs/workbench/contrib/localizations/electron-browser/localizations.contribution.ts",
210-
"./vs/workbench/contrib/localizations/electron-browser/localizationsActions.ts",
211-
"./vs/workbench/contrib/localizations/electron-browser/minimalTranslations.ts",
209+
"./vs/workbench/contrib/localizations/browser/localizations.contribution.ts",
210+
"./vs/workbench/contrib/localizations/browser/localizationsActions.ts",
211+
"./vs/workbench/contrib/localizations/browser/minimalTranslations.ts",
212212
"./vs/workbench/contrib/logs/common/logConstants.ts",
213-
"./vs/workbench/contrib/logs/electron-browser/logs.contribution.ts",
214-
"./vs/workbench/contrib/logs/electron-browser/logsActions.ts",
213+
"./vs/workbench/contrib/logs/common/logs.contribution.ts",
214+
"./vs/workbench/contrib/logs/common/logsActions.ts",
215215
"./vs/workbench/contrib/markers/electron-browser/constants.ts",
216216
"./vs/workbench/contrib/markers/electron-browser/markers.ts",
217217
"./vs/workbench/contrib/markers/electron-browser/markersFileDecorations.ts",
@@ -307,9 +307,9 @@
307307
"./vs/workbench/contrib/terminal/test/electron-browser/terminalLinkHandler.test.ts",
308308
"./vs/workbench/contrib/terminal/test/node/terminalCommandTracker.test.ts",
309309
"./vs/workbench/contrib/terminal/test/node/terminalEnvironment.test.ts",
310-
"./vs/workbench/contrib/themes/electron-browser/themes.contribution.ts",
310+
"./vs/workbench/contrib/themes/browser/themes.contribution.ts",
311311
"./vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts",
312-
"./vs/workbench/contrib/url/electron-browser/url.contribution.ts",
312+
"./vs/workbench/contrib/url/common/url.contribution.ts",
313313
"./vs/workbench/contrib/webview/electron-browser/webviewProtocols.ts",
314314
"./vs/workbench/electron-browser/window.ts",
315315
"./vs/workbench/services/activity/common/activity.ts",

src/vs/workbench/contrib/cli/electron-browser/cli.contribution.ts renamed to src/vs/workbench/contrib/cli/node/cli.contribution.ts

File renamed without changes.

src/vs/workbench/contrib/localizations/electron-browser/localizations.contribution.ts renamed to src/vs/workbench/contrib/localizations/browser/localizations.contribution.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/plat
1010
import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
1111
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
1212
import { Disposable } from 'vs/base/common/lifecycle';
13-
import { ConfigureLocaleAction } from 'vs/workbench/contrib/localizations/electron-browser/localizationsActions';
13+
import { ConfigureLocaleAction } from 'vs/workbench/contrib/localizations/browser/localizationsActions';
1414
import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
1515
import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
1616
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
@@ -26,7 +26,7 @@ import { IWindowsService } from 'vs/platform/windows/common/windows';
2626
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
2727
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
2828
import { VIEWLET_ID as EXTENSIONS_VIEWLET_ID, IExtensionsViewlet } from 'vs/workbench/contrib/extensions/common/extensions';
29-
import { minimumTranslatedStrings } from 'vs/workbench/contrib/localizations/electron-browser/minimalTranslations';
29+
import { minimumTranslatedStrings } from 'vs/workbench/contrib/localizations/browser/minimalTranslations';
3030
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
3131
import { CancellationToken } from 'vs/base/common/cancellation';
3232
import { ExtensionType } from 'vs/platform/extensions/common/extensions';

src/vs/workbench/contrib/localizations/electron-browser/localizationsActions.ts renamed to src/vs/workbench/contrib/localizations/browser/localizationsActions.ts

File renamed without changes.

src/vs/workbench/contrib/localizations/electron-browser/minimalTranslations.ts renamed to src/vs/workbench/contrib/localizations/browser/minimalTranslations.ts

File renamed without changes.

src/vs/workbench/contrib/logs/electron-browser/logs.contribution.ts renamed to src/vs/workbench/contrib/logs/common/logs.contribution.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { URI } from 'vs/base/common/uri';
1616
import * as Constants from 'vs/workbench/contrib/logs/common/logConstants';
1717
import { IWorkbenchActionRegistry, Extensions as WorkbenchActionExtensions } from 'vs/workbench/common/actions';
1818
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
19-
import { OpenLogsFolderAction, SetLogLevelAction } from 'vs/workbench/contrib/logs/electron-browser/logsActions';
19+
import { OpenLogsFolderAction, SetLogLevelAction } from 'vs/workbench/contrib/logs/common/logsActions';
2020
import { ILogService, LogLevel } from 'vs/platform/log/common/log';
2121

2222
class LogOutputChannels extends Disposable implements IWorkbenchContribution {

src/vs/workbench/contrib/logs/electron-browser/logsActions.ts renamed to src/vs/workbench/contrib/logs/common/logsActions.ts

File renamed without changes.

src/vs/workbench/contrib/themes/electron-browser/themes.contribution.ts renamed to src/vs/workbench/contrib/themes/browser/themes.contribution.ts

File renamed without changes.

src/vs/workbench/contrib/url/electron-browser/url.contribution.ts renamed to src/vs/workbench/contrib/url/common/url.contribution.ts

File renamed without changes.

‎src/vs/workbench/workbench.main.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ import 'vs/workbench/services/bulkEdit/electron-browser/bulkEditService';
4747
//#region --- workbench contributions
4848

4949
// Localizations
50-
import 'vs/workbench/contrib/localizations/electron-browser/localizations.contribution';
50+
import 'vs/workbench/contrib/localizations/browser/localizations.contribution';
5151

5252
// Preferences
5353
import 'vs/workbench/contrib/preferences/electron-browser/preferences.contribution';
5454
import 'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution';
5555

5656
// Logs
57-
import 'vs/workbench/contrib/logs/electron-browser/logs.contribution';
57+
import 'vs/workbench/contrib/logs/common/logs.contribution';
5858

5959
// Quick Open Handlers
6060
import 'vs/workbench/contrib/quickopen/browser/quickopen.contribution';
@@ -98,7 +98,7 @@ import 'vs/workbench/contrib/comments/electron-browser/comments.contribution';
9898
import 'vs/workbench/contrib/html/electron-browser/html.contribution';
9999

100100
// URL Support
101-
import 'vs/workbench/contrib/url/electron-browser/url.contribution';
101+
import 'vs/workbench/contrib/url/common/url.contribution';
102102

103103
// Webview
104104
import 'vs/workbench/contrib/webview/electron-browser/webview.contribution';
@@ -157,10 +157,10 @@ import 'vs/workbench/contrib/surveys/electron-browser/languageSurveys.contributi
157157
import 'vs/workbench/contrib/performance/electron-browser/performance.contribution';
158158

159159
// CLI
160-
import 'vs/workbench/contrib/cli/electron-browser/cli.contribution';
160+
import 'vs/workbench/contrib/cli/node/cli.contribution';
161161

162162
// Themes Support
163-
import 'vs/workbench/contrib/themes/electron-browser/themes.contribution';
163+
import 'vs/workbench/contrib/themes/browser/themes.contribution';
164164
import 'vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution';
165165

166166
// Watermark

0 commit comments

Comments
 (0)