Skip to content

Commit a45fb40

Browse files
jriekenjrieken
committed
make insets fit into layering scheme
1 parent d0e4fb5 commit a45fb40

9 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostC
2020
import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
2121
import { URI } from 'vs/base/common/uri';
2222
import { Selection } from 'vs/editor/common/core/selection';
23-
import * as codeInset from 'vs/workbench/contrib/codeinset/codeInset';
23+
import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
2424

2525
@extHostNamedCustomer(MainContext.MainThreadLanguageFeatures)
2626
export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesShape {

‎src/vs/workbench/api/electron-browser/mainThreadWebview.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
2424
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
2525
import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
2626
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
27-
import { CodeInsetController } from 'vs/workbench/contrib/codeinset/codeInset.contribution';
27+
import { CodeInsetController } from 'vs/workbench/contrib/codeinset/electron-browser/codeInset.contribution';
2828
import { IPartService, Parts } from 'vs/workbench/services/part/common/partService';
2929

3030
@extHostNamedCustomer(MainContext.MainThreadWebviews)

‎src/vs/workbench/api/node/extHost.protocol.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import { IMarkdownString } from 'vs/base/common/htmlContent';
4545
import { ResolvedAuthority } from 'vs/platform/remote/common/remoteAuthorityResolver';
4646
import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
4747
import { IRemoteConsoleLog } from 'vs/base/node/console';
48-
import * as codeInset from 'vs/workbench/contrib/codeinset/codeInset';
48+
import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
4949

5050
export interface IEnvironment {
5151
isExtensionDevelopmentDebug: boolean;

‎src/vs/workbench/api/node/extHostLanguageFeatures.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { ILogService } from 'vs/platform/log/common/log';
2727
import { CancellationToken } from 'vs/base/common/cancellation';
2828
import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
2929
import { ExtHostWebview } from 'vs/workbench/api/node/extHostWebview';
30-
import * as codeInset from 'vs/workbench/contrib/codeinset/codeInset';
30+
import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
3131
import { generateUuid } from 'vs/base/common/uuid';
3232

3333
// --- adapter

src/vs/workbench/contrib/codeinset/codeInset.ts renamed to src/vs/workbench/contrib/codeinset/common/codeInset.ts

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { StableEditorScrollState } from 'vs/editor/browser/core/editorState';
1010
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
1111
import * as editorCommon from 'vs/editor/common/editorCommon';
1212
import { IModelDecorationsChangeAccessor } from 'vs/editor/common/model';
13-
import { CodeInsetProviderRegistry, getCodeInsetData, ICodeInsetData } from './codeInset';
13+
import { CodeInsetProviderRegistry, getCodeInsetData, ICodeInsetData } from '../common/codeInset';
1414
import { CodeInsetWidget, CodeInsetHelper } from './codeInsetWidget';
1515
import { registerEditorContribution } from 'vs/editor/browser/editorExtensions';
1616
import { Registry } from 'vs/platform/registry/common/platform';

src/vs/workbench/contrib/codeinset/codeInsetWidget.css renamed to src/vs/workbench/contrib/codeinset/electron-browser/codeInsetWidget.css

File renamed without changes.

src/vs/workbench/contrib/codeinset/codeInsetWidget.ts renamed to src/vs/workbench/contrib/codeinset/electron-browser/codeInsetWidget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import 'vs/css!./codeInsetWidget';
77
import { Range } from 'vs/editor/common/core/range';
88
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
9-
import { ICodeInsetData } from './codeInset';
9+
import { ICodeInsetData } from '../common/codeInset';
1010
import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
1111
import { IModelDeltaDecoration, IModelDecorationsChangeAccessor, ITextModel } from 'vs/editor/common/model';
1212
import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ import 'vs/workbench/contrib/outline/browser/outline.contribution';
176176
import 'vs/workbench/contrib/experiments/electron-browser/experiments.contribution';
177177

178178
// Code Insets
179-
import 'vs/workbench/contrib/codeinset/codeInset.contribution';
179+
import 'vs/workbench/contrib/codeinset/electron-browser/codeInset.contribution';
180180

181181
// Issues
182182
import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';

0 commit comments

Comments
 (0)