Skip to content

Commit 3069c9f

Browse files
hediethediet
authored
Inline completion file renames (microsoft#226419)
1 parent 19d2a58 commit 3069c9f

30 files changed

+50
-51
lines changed

‎src/vs/editor/contrib/hover/browser/contentHoverController2.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { IEditorContribution, IScrollEvent } from 'vs/editor/common/editorCommon
1414
import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
1515
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1616
import { IHoverWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
17-
import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
17+
import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget';
1818
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
1919
import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
2020
import { HoverVerbosityAction } from 'vs/editor/common/languages';

‎src/vs/editor/contrib/inlineCompletions/browser/commandIds.ts renamed to ‎src/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.ts

File renamed without changes.

‎src/vs/editor/contrib/inlineCompletions/browser/commands.ts renamed to ‎src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import { asyncTransaction } from 'vs/base/common/observableInternal/base';
99
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
1010
import { EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
1111
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
12-
import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/commandIds';
13-
import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
14-
import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
12+
import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/controller/commandIds';
13+
import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys';
14+
import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
1515
import { Context as SuggestContext } from 'vs/editor/contrib/suggest/browser/suggest';
1616
import * as nls from 'vs/nls';
1717
import { MenuId, Action2 } from 'vs/platform/actions/common/actions';

‎src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.ts renamed to ‎src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IObservable, autorun } from 'vs/base/common/observable';
77
import { firstNonWhitespaceIndex } from 'vs/base/common/strings';
88
import { CursorColumns } from 'vs/editor/common/core/cursorColumns';
9-
import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
9+
import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
1010
import { RawContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
1111
import { Disposable } from 'vs/base/common/lifecycle';
1212
import { localize } from 'vs/nls';

‎src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.ts renamed to ‎src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import { Range } from 'vs/editor/common/core/range';
2222
import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
2323
import { ILanguageFeatureDebounceService } from 'vs/editor/common/services/languageFeatureDebounce';
2424
import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
25-
import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/commandIds';
26-
import { GhostTextWidget } from 'vs/editor/contrib/inlineCompletions/browser/ghostTextWidget';
27-
import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
28-
import { InlineCompletionsHintsWidget, InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
29-
import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
30-
import { SuggestWidgetAdaptor } from 'vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider';
25+
import { inlineSuggestCommitId } from 'vs/editor/contrib/inlineCompletions/browser/controller/commandIds';
26+
import { GhostTextView } from 'vs/editor/contrib/inlineCompletions/browser/view/ghostTextView';
27+
import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys';
28+
import { InlineCompletionsHintsWidget, InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget';
29+
import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
30+
import { SuggestWidgetAdaptor } from 'vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor';
3131
import { localize } from 'vs/nls';
3232
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
3333
import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
@@ -105,7 +105,7 @@ export class InlineCompletionsController extends Disposable {
105105
private readonly _stablizedGhostTexts = convertItemsToStableObservables(this._ghostTexts, this._store);
106106

107107
private readonly _ghostTextWidgets = mapObservableArrayCached(this, this._stablizedGhostTexts, (ghostText, store) =>
108-
store.add(this._instantiationService.createInstance(GhostTextWidget, this.editor, {
108+
store.add(this._instantiationService.createInstance(GhostTextView, this.editor, {
109109
ghostText: ghostText,
110110
minReservedLineCount: constObservable(0),
111111
targetTextModel: this.model.map(v => v?.textModel),

‎src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.ts renamed to ‎src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import { Range } from 'vs/editor/common/core/range';
1313
import { ILanguageService } from 'vs/editor/common/languages/language';
1414
import { IModelDecoration } from 'vs/editor/common/model';
1515
import { HoverAnchor, HoverAnchorType, HoverForeignElementAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from 'vs/editor/contrib/hover/browser/hoverTypes';
16-
import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
17-
import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
16+
import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
17+
import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget';
1818
import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
1919
import * as nls from 'vs/nls';
2020
import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';

‎src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.css renamed to ‎src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.css

File renamed without changes.

‎src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.ts renamed to ‎src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import { EditorOption } from 'vs/editor/common/config/editorOptions';
2121
import { Position } from 'vs/editor/common/core/position';
2222
import { Command, InlineCompletionTriggerKind } from 'vs/editor/common/languages';
2323
import { PositionAffinity } from 'vs/editor/common/model';
24-
import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId } from 'vs/editor/contrib/inlineCompletions/browser/commandIds';
25-
import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
24+
import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId } from 'vs/editor/contrib/inlineCompletions/browser/controller/commandIds';
25+
import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
2626
import { localize } from 'vs/nls';
2727
import { MenuEntryActionViewItem, createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
2828
import { IMenuWorkbenchToolBarOptions, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';

‎src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
77
import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
8-
import { TriggerInlineSuggestionAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptInlineCompletion, HideInlineCompletion, ToggleAlwaysShowInlineSuggestionToolbar, AcceptNextLineOfInlineCompletion } from 'vs/editor/contrib/inlineCompletions/browser/commands';
9-
import { InlineCompletionsHoverParticipant } from 'vs/editor/contrib/inlineCompletions/browser/hoverParticipant';
8+
import { TriggerInlineSuggestionAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptInlineCompletion, HideInlineCompletion, ToggleAlwaysShowInlineSuggestionToolbar, AcceptNextLineOfInlineCompletion } from 'vs/editor/contrib/inlineCompletions/browser/controller/commands';
9+
import { InlineCompletionsHoverParticipant } from 'vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant';
1010
import { InlineCompletionsAccessibleView } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView';
11-
import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
11+
import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
1212
import { AccessibleViewRegistry } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
1313
import { registerAction2 } from 'vs/platform/actions/common/actions';
1414

‎src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import { Emitter, Event } from 'vs/base/common/event';
77
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
88
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
9-
import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys';
10-
import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
9+
import { InlineCompletionContextKeys } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys';
10+
import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
1111
import { AccessibleViewType, AccessibleViewProviderId, IAccessibleViewContentProvider } from 'vs/platform/accessibility/browser/accessibleView';
1212
import { IAccessibleViewImplentation } from 'vs/platform/accessibility/browser/accessibleViewRegistry';
1313
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
1414
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
1515
import { Disposable } from 'vs/base/common/lifecycle';
16-
import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel';
16+
import { InlineCompletionsModel } from 'vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel';
1717

1818
export class InlineCompletionsAccessibleView implements IAccessibleViewImplentation {
1919
readonly type = AccessibleViewType.View;
@@ -77,4 +77,3 @@ class InlineCompletionsAccessibleViewContentProvider extends Disposable implemen
7777
this._editor.focus();
7878
}
7979
}
80-

0 commit comments

Comments
 (0)