Skip to content

Commit 49ea79b

Browse files
jriekenjrieken
committed
make bulk edit service implementation a contrib, microsoft#105283 
1 parent fe83bef commit 49ea79b

12 files changed

Lines changed: 12 additions & 13 deletions

File tree

src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts renamed to src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import { IProgress, IProgressStep, Progress } from 'vs/platform/progress/common/
1414
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
1515
import { EditorOption } from 'vs/editor/common/config/editorOptions';
1616
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
17-
import { BulkTextEdits } from 'vs/workbench/services/bulkEdit/browser/bulkTextEdits';
18-
import { BulkFileEdits } from 'vs/workbench/services/bulkEdit/browser/bulkFileEdits';
17+
import { BulkTextEdits } from 'vs/workbench/contrib/bulkEdit/browser/bulkTextEdits';
18+
import { BulkFileEdits } from 'vs/workbench/contrib/bulkEdit/browser/bulkFileEdits';
1919
import { ResourceMap } from 'vs/base/common/map';
2020

2121
type Edit = WorkspaceFileEdit | WorkspaceTextEdit;

src/vs/workbench/services/bulkEdit/browser/bulkFileEdits.ts renamed to src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.ts

File renamed without changes.

src/vs/workbench/services/bulkEdit/browser/bulkTextEdits.ts renamed to src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts

File renamed without changes.

src/vs/workbench/services/bulkEdit/browser/conflicts.ts renamed to src/vs/workbench/contrib/bulkEdit/browser/conflicts.ts

File renamed without changes.

src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.contribution.ts renamed to src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry } fr
99
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
1010
import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
1111
import { WorkspaceEdit } from 'vs/editor/common/modes';
12-
import { BulkEditPane } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditPane';
12+
import { BulkEditPane } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane';
1313
import { IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainerLocation, IViewsRegistry, FocusedViewContext, IViewsService } from 'vs/workbench/common/views';
1414
import { localize } from 'vs/nls';
1515
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
1616
import { RawContextKey, IContextKeyService, IContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
1717
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
1818
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
19-
import { BulkEditPreviewProvider } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditPreview';
19+
import { BulkEditPreviewProvider } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview';
2020
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
2121
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
2222
import { WorkbenchListFocusContextKey } from 'vs/platform/list/browser/listService';
@@ -366,4 +366,3 @@ Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews
366366
ctorDescriptor: new SyncDescriptor(BulkEditPane),
367367
containerIcon: Codicon.lightbulb.classNames,
368368
}], container);
369-

src/vs/workbench/contrib/bulkEdit/browser/bulkEdit.css renamed to src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.css

File renamed without changes.

src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts renamed to src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPane.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import 'vs/css!./bulkEdit';
77
import { WorkbenchAsyncDataTree, IOpenEvent } from 'vs/platform/list/browser/listService';
88
import { WorkspaceEdit } from 'vs/editor/common/modes';
9-
import { BulkEditElement, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, BulkEditDataSource, BulkEditIdentityProvider, FileElement, TextEditElement, BulkEditAccessibilityProvider, CategoryElementRenderer, BulkEditNaviLabelProvider, CategoryElement, BulkEditSorter } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditTree';
9+
import { BulkEditElement, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, BulkEditDataSource, BulkEditIdentityProvider, FileElement, TextEditElement, BulkEditAccessibilityProvider, CategoryElementRenderer, BulkEditNaviLabelProvider, CategoryElement, BulkEditSorter } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree';
1010
import { FuzzyScore } from 'vs/base/common/filters';
1111
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1212
import { registerThemingParticipant, IColorTheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
1313
import { diffInserted, diffRemoved } from 'vs/platform/theme/common/colorRegistry';
1414
import { localize } from 'vs/nls';
1515
import { DisposableStore } from 'vs/base/common/lifecycle';
1616
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
17-
import { BulkEditPreviewProvider, BulkFileOperations, BulkFileOperationType } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditPreview';
17+
import { BulkEditPreviewProvider, BulkFileOperations, BulkFileOperationType } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview';
1818
import { ILabelService } from 'vs/platform/label/common/label';
1919
import { ITextModelService } from 'vs/editor/common/services/resolverService';
2020
import { URI } from 'vs/base/common/uri';

src/vs/workbench/contrib/bulkEdit/browser/bulkEditPreview.ts renamed to src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati
1717
import { IFileService } from 'vs/platform/files/common/files';
1818
import { Emitter, Event } from 'vs/base/common/event';
1919
import { IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
20-
import { ConflictDetector } from 'vs/workbench/services/bulkEdit/browser/conflicts';
20+
import { ConflictDetector } from 'vs/workbench/contrib/bulkEdit/browser/conflicts';
2121
import { ResourceMap } from 'vs/base/common/map';
2222
import { localize } from 'vs/nls';
2323
import { extUri } from 'vs/base/common/resources';

src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts renamed to src/vs/workbench/contrib/bulkEdit/browser/preview/bulkEditTree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import * as dom from 'vs/base/browser/dom';
1414
import { ITextModel } from 'vs/editor/common/model';
1515
import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
1616
import { TextModel } from 'vs/editor/common/model/textModel';
17-
import { BulkFileOperations, BulkFileOperation, BulkFileOperationType, BulkTextEdit, BulkCategory } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditPreview';
17+
import { BulkFileOperations, BulkFileOperation, BulkFileOperationType, BulkTextEdit, BulkCategory } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview';
1818
import { FileKind } from 'vs/platform/files/common/files';
1919
import { localize } from 'vs/nls';
2020
import { ILabelService } from 'vs/platform/label/common/label';

‎src/vs/workbench/contrib/bulkEdit/test/browser/bulkEditPreview.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
1313
import { IModelService } from 'vs/editor/common/services/modelService';
1414
import type { WorkspaceEdit } from 'vs/editor/common/modes';
1515
import { URI } from 'vs/base/common/uri';
16-
import { BulkFileOperations } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditPreview';
16+
import { BulkFileOperations } from 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEditPreview';
1717
import { Range } from 'vs/editor/common/core/range';
1818

1919
suite('BulkEditPreview', function () {

0 commit comments

Comments
 (0)