Skip to content

Commit b5dbace

Browse files
mjbvzmjbvz
committed
Better name for codeAction types file
1 parent 245b4da commit b5dbace

12 files changed

Lines changed: 11 additions & 12 deletions

File tree

‎src/vs/editor/contrib/codeAction/codeAction.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { Selection } from 'vs/editor/common/core/selection';
1313
import { ITextModel } from 'vs/editor/common/model';
1414
import { CodeAction, CodeActionContext, CodeActionProviderRegistry, CodeActionTrigger as CodeActionTriggerKind } from 'vs/editor/common/modes';
1515
import { IModelService } from 'vs/editor/common/services/modelService';
16-
import { CodeActionFilter, CodeActionKind, CodeActionTrigger, filtersAction, mayIncludeActionsOfKind } from './codeActionTrigger';
16+
import { CodeActionFilter, CodeActionKind, CodeActionTrigger, filtersAction, mayIncludeActionsOfKind } from './types';
1717
import { TextModelCancellationTokenSource } from 'vs/editor/browser/core/editorState';
1818
import { DisposableStore, IDisposable, Disposable } from 'vs/base/common/lifecycle';
1919

‎src/vs/editor/contrib/codeAction/codeActionCommands.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { IMarkerService } from 'vs/platform/markers/common/markers';
3030
import { INotificationService } from 'vs/platform/notification/common/notification';
3131
import { IEditorProgressService } from 'vs/platform/progress/common/progress';
3232
import { CodeActionModel, CodeActionsState, SUPPORTED_CODE_ACTIONS } from './codeActionModel';
33-
import { CodeActionAutoApply, CodeActionFilter, CodeActionKind, CodeActionTrigger, CodeActionCommandArgs } from './codeActionTrigger';
33+
import { CodeActionAutoApply, CodeActionFilter, CodeActionKind, CodeActionTrigger, CodeActionCommandArgs } from './types';
3434

3535
function contextKeyForSupportedActions(kind: CodeActionKind) {
3636
return ContextKeyExpr.regex(

‎src/vs/editor/contrib/codeAction/codeActionModel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/cont
1616
import { IMarkerService } from 'vs/platform/markers/common/markers';
1717
import { IEditorProgressService } from 'vs/platform/progress/common/progress';
1818
import { getCodeActions, CodeActionSet } from './codeAction';
19-
import { CodeActionTrigger } from './codeActionTrigger';
19+
import { CodeActionTrigger } from './types';
2020
import { EditorOption } from 'vs/editor/common/config/editorOptions';
2121
import { isEqual } from 'vs/base/common/resources';
2222

‎src/vs/editor/contrib/codeAction/codeActionUi.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { MessageController } from 'vs/editor/contrib/message/messageController';
1212
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
1313
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
1414
import { CodeActionsState } from './codeActionModel';
15-
import { CodeActionAutoApply } from './codeActionTrigger';
15+
import { CodeActionAutoApply } from './types';
1616
import { CodeActionWidget } from './codeActionWidget';
1717
import { LightBulbWidget } from './lightBulbWidget';
1818
import { IPosition } from 'vs/editor/common/core/position';

‎src/vs/editor/contrib/codeAction/codeActionWidget.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { IPosition, Position } from 'vs/editor/common/core/position';
1515
import { ScrollType } from 'vs/editor/common/editorCommon';
1616
import { CodeAction } from 'vs/editor/common/modes';
1717
import { CodeActionSet, refactorCommandId, sourceActionCommandId, codeActionCommandId, organizeImportsCommandId, fixAllCommandId } from 'vs/editor/contrib/codeAction/codeAction';
18-
import { CodeActionAutoApply, CodeActionCommandArgs, CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
18+
import { CodeActionAutoApply, CodeActionCommandArgs, CodeActionKind } from 'vs/editor/contrib/codeAction/types';
1919
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
2020
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
2121
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';

‎src/vs/editor/contrib/codeAction/test/codeAction.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Range } from 'vs/editor/common/core/range';
99
import { TextModel } from 'vs/editor/common/model/textModel';
1010
import * as modes from 'vs/editor/common/modes';
1111
import { getCodeActions } from 'vs/editor/contrib/codeAction/codeAction';
12-
import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
12+
import { CodeActionKind } from 'vs/editor/contrib/codeAction/types';
1313
import { IMarkerData, MarkerSeverity } from 'vs/platform/markers/common/markers';
1414
import { CancellationToken } from 'vs/base/common/cancellation';
1515

‎src/vs/editor/contrib/codeAction/test/codeActionKeybindingResolver.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as assert from 'assert';
77
import { ChordKeybinding, KeyCode, SimpleKeybinding } from 'vs/base/common/keyCodes';
88
import { OperatingSystem } from 'vs/base/common/platform';
99
import { refactorCommandId, organizeImportsCommandId } from 'vs/editor/contrib/codeAction/codeAction';
10-
import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
10+
import { CodeActionKind } from 'vs/editor/contrib/codeAction/types';
1111
import { CodeActionKeybindingResolver } from 'vs/editor/contrib/codeAction/codeActionWidget';
1212
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
1313
import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';

src/vs/editor/contrib/codeAction/codeActionTrigger.ts renamed to src/vs/editor/contrib/codeAction/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ export function mayIncludeActionsOfKind(filter: CodeActionFilter, providedKind:
6565
return true;
6666
}
6767

68-
6968
export function filtersAction(filter: CodeActionFilter, action: CodeAction): boolean {
7069
const actionKind = action.kind ? new CodeActionKind(action.kind) : undefined;
7170

‎src/vs/editor/contrib/hover/modesContentHover.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
3434
import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
3535
import { getCodeActions, CodeActionSet } from 'vs/editor/contrib/codeAction/codeAction';
3636
import { QuickFixAction, QuickFixController } from 'vs/editor/contrib/codeAction/codeActionCommands';
37-
import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
37+
import { CodeActionKind } from 'vs/editor/contrib/codeAction/types';
3838
import { IModeService } from 'vs/editor/common/services/modeService';
3939
import { IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
4040
import { EditorOption } from 'vs/editor/common/config/editorOptions';

‎src/vs/workbench/api/browser/mainThreadSaveParticipant.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { CodeAction } from 'vs/editor/common/modes';
1919
import { shouldSynchronizeModel } from 'vs/editor/common/services/modelService';
2020
import { getCodeActions } from 'vs/editor/contrib/codeAction/codeAction';
2121
import { applyCodeAction } from 'vs/editor/contrib/codeAction/codeActionCommands';
22-
import { CodeActionKind } from 'vs/editor/contrib/codeAction/codeActionTrigger';
22+
import { CodeActionKind } from 'vs/editor/contrib/codeAction/types';
2323
import { formatDocumentWithSelectedProvider, FormattingMode } from 'vs/editor/contrib/format/format';
2424
import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
2525
import { localize } from 'vs/nls';

0 commit comments

Comments
 (0)