Skip to content

Refactor #1642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 4, 2017
Merged

Refactor #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7c6f6a9
Move textobjects and surround out of actions.
rebornix May 3, 2017
bcf7e07
Fix #1630
rebornix May 3, 2017
5868da5
Fix travis link.
rebornix May 3, 2017
346f6f4
motion and insert commands.
rebornix May 4, 2017
7f8c5ae
Downgrade tslint first as the current one doesn't support no-used-var…
rebornix May 4, 2017
6d78aff
Move operator and base stuff out of actions.ts
rebornix May 4, 2017
47d9a9d
Move easymotion out and use one file to reference all files.
rebornix May 4, 2017
df1909f
actions are in good state.
rebornix May 4, 2017
a223f08
Group common code.
rebornix May 4, 2017
1266277
Remove unused var.
rebornix May 4, 2017
d000f01
Absolute path resolution.
rebornix May 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1 align="center"><img src="./images/icon.png" height="128"><br>VSCodeVim</h1>
<p align="center"><strong>Vim emulation for Visual Studio Code.</strong></p>
<p align="center"><a href="http://aka.ms/vscodevim"><img src="http://vsmarketplacebadge.apphb.com/version/vscodevim.vim.svg" alt="Version"></a><a href="https://travis-ci.org/VSCodeVim/Vim.svg?branch=master"><img src="https://travis-ci.org/VSCodeVim/Vim.svg?branch=master" alt="Build Status"></a><a href="https://vscodevim-slackin.azurewebsites.net"><img src="https://vscodevim-slackin.azurewebsites.net/badge.svg" alt="Slack Status"></a></p>
<p align="center"><a href="http://aka.ms/vscodevim"><img src="http://vsmarketplacebadge.apphb.com/version/vscodevim.vim.svg" alt="Version"></a><a href="https://travis-ci.org/VSCodeVim/Vim"><img src="https://travis-ci.org/VSCodeVim/Vim.svg?branch=master" alt="Build Status"></a><a href="https://vscodevim-slackin.azurewebsites.net"><img src="https://vscodevim-slackin.azurewebsites.net/badge.svg" alt="Slack Status"></a></p>
<hr>

VSCodeVim is a [Visual Studio Code](https://code.visualstudio.com/) extension that enables Vim keybindings, including:
Expand Down
15 changes: 9 additions & 6 deletions extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ import * as _ from "lodash";
import { showCmdLine } from './src/cmd_line/main';
import { ModeHandler } from './src/mode/modeHandler';
import { taskQueue } from './src/taskQueue';
import { Position } from './src/motion/position';
import { Position } from './src/common/motion/position';
import { Globals } from './src/globals';
import { AngleBracketNotation } from './src/notation';
import { ModeName } from './src/mode/mode';
import { Configuration } from './src/configuration/configuration'
import { Configuration } from './src/configuration/configuration';
import { ICodeKeybinding } from './src/mode/remapper';
import { runCmdLine } from './src/cmd_line/main';

import './src/actions/vim.all';

interface VSCodeKeybinding {
key: string;
mac?: string;
Expand Down Expand Up @@ -142,11 +144,12 @@ export async function activate(context: vscode.ExtensionContext) {
vscode.workspace.onDidChangeConfiguration((e: void) => {
Configuration.updateConfiguration();

/* tslint:disable:forin */
// Update the remappers foreach modehandler
for (let mh in modeHandlerToEditorIdentity) {
modeHandlerToEditorIdentity[mh].createRemappers();
}
})
});

vscode.window.onDidChangeActiveTextEditor(handleActiveEditorChange, this);

Expand All @@ -170,7 +173,7 @@ export async function activate(context: vscode.ExtensionContext) {
modeHandler.vimState.historyTracker.currentContentChanges =
modeHandler.vimState.historyTracker.currentContentChanges.concat(event.contentChanges);
}
}
};

if (Globals.isTesting) {
contentChangeHandler(Globals.modeHandlerForTesting as ModeHandler);
Expand Down Expand Up @@ -209,7 +212,8 @@ export async function activate(context: vscode.ExtensionContext) {
const mh = await getAndUpdateModeHandler();

if (compositionState.isInComposition) {
compositionState.composingText = compositionState.composingText.substr(0, compositionState.composingText.length - args.replaceCharCnt) + args.text;
compositionState.composingText = compositionState.composingText
.substr(0, compositionState.composingText.length - args.replaceCharCnt) + args.text;
} else {
await vscode.commands.executeCommand('default:replacePreviousChar', {
text: args.text,
Expand All @@ -226,7 +230,6 @@ export async function activate(context: vscode.ExtensionContext) {
overrideCommand(context, 'compositionStart', async (args) => {
taskQueue.enqueueTask({
promise: async () => {
const mh = await getAndUpdateModeHandler();
compositionState.isInComposition = true;
},
isRunning: false
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,11 @@
"gulp-inject-string": "^1.1.0",
"gulp-shell": "^0.5.2",
"gulp-tag-version": "^1.3.0",
"gulp-tslint": "^8.0.0",
"gulp-tslint": "^7.0.1",
"gulp-typings": "^2.0.0",
"merge-stream": "^1.0.0",
"mocha": "^3.2.0",
"tslint": "^5.1.0",
"tslint": "^4.3.1",
"typescript": "^2.3.2",
"vscode": "^1.0.5"
}
Expand Down
Loading