Skip to content

Commit d14c9ba

Browse files
committed
Organize imports with prettier plugin
1 parent 80941dc commit d14c9ba

File tree

99 files changed

+300
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+300
-297
lines changed

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"printWidth": 100,
3-
"singleQuote": true
3+
"singleQuote": true,
4+
"plugins": ["prettier-plugin-organize-imports"]
45
}

extension.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ import './src/actions/include-plugins';
1111
*/
1212

1313
import './src/configuration/validators/inputMethodSwitcherValidator';
14-
import './src/configuration/validators/remappingValidator';
1514
import './src/configuration/validators/neovimValidator';
15+
import './src/configuration/validators/remappingValidator';
1616
import './src/configuration/validators/vimrcValidator';
1717

18+
import * as path from 'path';
1819
import * as vscode from 'vscode';
1920
import {
2021
activate as activateFunc,
2122
loadConfiguration,
2223
registerCommand,
2324
registerEventListener,
2425
} from './extensionBase';
26+
import { vimrc } from './src/configuration/vimrc';
2527
import { Globals } from './src/globals';
2628
import { Register } from './src/register/register';
27-
import { vimrc } from './src/configuration/vimrc';
28-
import * as path from 'path';
2929
import { Logger } from './src/util/logger';
3030

3131
export { getAndUpdateModeHandler } from './extensionBase';

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,6 +1235,7 @@
12351235
"mocha": "11.7.2",
12361236
"plugin-error": "2.0.1",
12371237
"prettier": "3.6.2",
1238+
"prettier-plugin-organize-imports": "^4.3.0",
12381239
"sinon": "20.0.0",
12391240
"ts-loader": "9.5.4",
12401241
"typescript": "5.9.3",

src/actions/base.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Position } from 'vscode';
22
import { Cursor } from '../common/motion/cursor';
3+
import { isLiteralMode, unmapLiteral } from '../configuration/langmap';
34
import { Notation } from '../configuration/notation';
4-
import { ActionType, IBaseAction } from './types';
55
import { isTextTransformation } from '../transformations/transformations';
66
import { configuration } from './../configuration/configuration';
77
import { Mode } from './../mode/mode';
88
import { VimState } from './../state/vimState';
9-
import { isLiteralMode, unmapLiteral } from '../configuration/langmap';
9+
import { ActionType, IBaseAction } from './types';
1010

1111
export abstract class BaseAction implements IBaseAction {
1212
abstract readonly actionType: ActionType;

src/actions/baseMotion.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { BaseAction } from './base';
1+
import { Position } from 'vscode';
22
import { Mode } from '../mode/mode';
33
import { VimState } from '../state/vimState';
44
import { clamp } from '../util/util';
5-
import { Position } from 'vscode';
5+
import { BaseAction } from './base';
66

77
export function isIMovement(o: IMovement | Position): o is IMovement {
88
return (o as IMovement).start !== undefined && (o as IMovement).stop !== undefined;

src/actions/commands/insert.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import { RecordedState } from '../../state/recordedState';
88
import { VimState } from '../../state/vimState';
99
import { StatusBar } from '../../statusBar';
1010
import { getCursorsAfterSync, isHighSurrogate, isLowSurrogate } from '../../util/util';
11+
import { BaseMovement } from '../baseMotion';
12+
import { MoveDown, MoveLeft, MoveRight, MoveUp } from '../motion';
1113
import { PositionDiff } from './../../common/motion/position';
1214
import { configuration } from './../../configuration/configuration';
1315
import { Mode } from './../../mode/mode';
@@ -18,8 +20,6 @@ import { CommandNumber } from './actions';
1820
import { DefaultDigraphs } from './digraphs';
1921
import { DocumentContentChangeAction } from './documentChange';
2022
import { EnterReplaceMode } from './replace';
21-
import { BaseMovement } from '../baseMotion';
22-
import { MoveUp, MoveDown, MoveLeft, MoveRight } from '../motion';
2323

2424
@RegisterAction
2525
export class Insert extends BaseCommand {

src/actions/commands/join.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { RegisterMode } from '../../register/register';
77
import { VimState } from '../../state/vimState';
88
import { TextEditor } from '../../textEditor';
99
import { isTextTransformation } from '../../transformations/transformations';
10-
import { RegisterAction, BaseCommand } from '../base';
10+
import { BaseCommand, RegisterAction } from '../base';
1111

1212
@RegisterAction
1313
class ActionJoin extends BaseCommand {

src/actions/commands/navigate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Mode } from '../../mode/mode';
66
import { globalState } from '../../state/globalState';
77
import { VimState } from '../../state/vimState';
88
import { StatusBar } from '../../statusBar';
9-
import { RegisterAction, BaseCommand } from '../base';
9+
import { BaseCommand, RegisterAction } from '../base';
1010

1111
@RegisterAction
1212
class GoToDeclaration extends BaseCommand {

src/actions/commands/put.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import * as vscode from 'vscode';
22
import { Position, TextDocument } from 'vscode';
3+
import { Cursor } from '../../common/motion/cursor';
34
import { laterOf, PositionDiff, sorted } from '../../common/motion/position';
45
import { configuration } from '../../configuration/configuration';
6+
import { VimError } from '../../error';
57
import { isVisualMode, Mode } from '../../mode/mode';
6-
import { Register, RegisterMode, IRegisterContent } from '../../register/register';
8+
import { IRegisterContent, Register, RegisterMode } from '../../register/register';
79
import { RecordedState } from '../../state/recordedState';
810
import { VimState } from '../../state/vimState';
11+
import { StatusBar } from '../../statusBar';
912
import { TextEditor } from '../../textEditor';
13+
import { Transformation } from '../../transformations/transformations';
1014
import { reportLinesChanged } from '../../util/statusBarTextUtils';
1115
import { BaseCommand, RegisterAction } from '../base';
12-
import { StatusBar } from '../../statusBar';
13-
import { VimError } from '../../error';
14-
import { Cursor } from '../../common/motion/cursor';
15-
import { Transformation } from '../../transformations/transformations';
1616

1717
function firstNonBlankChar(text: string): number {
1818
return text.match(/\S/)?.index ?? 0;

src/actions/commands/replace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { Position, Range } from 'vscode';
22
import { Cursor } from '../../common/motion/cursor';
33
import { PositionDiff, sorted } from '../../common/motion/position';
44
import { DotCommandStatus, Mode, visualBlockGetTopLeftPosition } from '../../mode/mode';
5+
import { ModeDataFor } from '../../mode/modeData';
56
import { VimState } from '../../state/vimState';
67
import { TextEditor } from '../../textEditor';
78
import { BaseCommand, RegisterAction } from '../base';
8-
import { ModeDataFor } from '../../mode/modeData';
99
import { BaseMovement } from '../baseMotion';
10-
import { MoveUp, MoveDown, MoveLeft, MoveRight } from '../motion';
10+
import { MoveDown, MoveLeft, MoveRight, MoveUp } from '../motion';
1111

1212
@RegisterAction
1313
export class ReplaceCharacter extends BaseCommand {

0 commit comments

Comments
 (0)