Skip to content
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

Use block cursor in visual & underline in replace #1394

Merged
merged 2 commits into from
Mar 15, 2017
Merged

Use block cursor in visual & underline in replace #1394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5467dbc
Use block cursor in visual & underline in replace
net Mar 13, 2017
e344389
Mitigate Microsoft/vscode#17472 bug for underline cursor
net Mar 13, 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
4 changes: 3 additions & 1 deletion src/mode/mode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ export enum ModeName {
}

export enum VSCodeVimCursorType {
Native,
Block,
Line,
Underline,
TextDecoration
}

Expand Down
2 changes: 1 addition & 1 deletion src/mode/modeEasyMotion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VSCodeVimCursorType } from './mode';

export class EasyMotionMode extends Mode {
public text = "EasyMotion Mode";
public cursorType = VSCodeVimCursorType.Native;
public cursorType = VSCodeVimCursorType.Block;

constructor() {
super(ModeName.EasyMotionMode);
Expand Down
35 changes: 24 additions & 11 deletions src/mode/modeHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1694,11 +1694,17 @@ export class ModeHandler implements vscode.Disposable {
.update("cursorBlinking", this.currentMode.name !== ModeName.Insert ? "solid" : "blink", true);
}

// Use native block cursor if possible.
let cursorStyle = this.currentMode.cursorType === VSCodeVimCursorType.Native &&
this.currentMode.name !== ModeName.VisualBlockInsertMode &&
this.currentMode.name !== ModeName.Insert ?
vscode.TextEditorCursorStyle.Block : vscode.TextEditorCursorStyle.Line;
// Use native cursor if possible. Default to Block.
let cursorStyle = vscode.TextEditorCursorStyle.Block;
switch (this.currentMode.cursorType) {
case VSCodeVimCursorType.TextDecoration:
case VSCodeVimCursorType.Line:
cursorStyle = vscode.TextEditorCursorStyle.Line;
break;
case VSCodeVimCursorType.Underline:
cursorStyle = vscode.TextEditorCursorStyle.Underline;
break;
}

let options = vscode.window.activeTextEditor.options;
options.cursorStyle = cursorStyle;
Expand All @@ -1707,12 +1713,19 @@ export class ModeHandler implements vscode.Disposable {
// TODO xconverge: temporary workaround for vscode bug not changing cursor style properly
// https://github.com/Microsoft/vscode/issues/17472
// https://github.com/Microsoft/vscode/issues/17513
if (options.cursorStyle === vscode.TextEditorCursorStyle.Block) {
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Line;
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Block;
} else if (options.cursorStyle === vscode.TextEditorCursorStyle.Line) {
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Block;
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Line;
switch (options.cursorStyle) {
case vscode.TextEditorCursorStyle.Block:
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Line;
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Block;
break;
case vscode.TextEditorCursorStyle.Line:
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Block;
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Line;
break;
case vscode.TextEditorCursorStyle.Underline:
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Block;
vscode.window.activeTextEditor.options.cursorStyle = vscode.TextEditorCursorStyle.Underline;
break;
}

if (this.currentMode.cursorType === VSCodeVimCursorType.TextDecoration &&
Expand Down
2 changes: 1 addition & 1 deletion src/mode/modeInsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VSCodeVimCursorType } from './mode';

export class InsertMode extends Mode {
public text = "Insert Mode";
public cursorType = VSCodeVimCursorType.Native;
public cursorType = VSCodeVimCursorType.Line;

constructor() {
super(ModeName.Insert);
Expand Down
2 changes: 1 addition & 1 deletion src/mode/modeInsertVisualBlock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VSCodeVimCursorType } from './mode';

export class InsertVisualBlockMode extends Mode {
public text = "Visual Block Insert Mode";
public cursorType = VSCodeVimCursorType.Native;
public cursorType = VSCodeVimCursorType.Line;
public isVisualMode = true;

constructor() {
Expand Down
2 changes: 1 addition & 1 deletion src/mode/modeNormal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export class NormalMode extends Mode {
private _modeHandler: ModeHandler;

public text = "Normal Mode";
public cursorType = VSCodeVimCursorType.Native;
public cursorType = VSCodeVimCursorType.Block;

constructor(modeHandler: ModeHandler) {
super(ModeName.Normal);
Expand Down
2 changes: 1 addition & 1 deletion src/mode/modeReplace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VSCodeVimCursorType } from './mode';

export class ReplaceMode extends Mode {
public text = "Replace";
public cursorType = VSCodeVimCursorType.TextDecoration;
public cursorType = VSCodeVimCursorType.Underline;

constructor() {
super(ModeName.Replace);
Expand Down
2 changes: 1 addition & 1 deletion src/mode/modeSearchInProgress.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VSCodeVimCursorType } from './mode';

export class SearchInProgressMode extends Mode {
public text = "Search In Progress";
public cursorType = VSCodeVimCursorType.Native;
public cursorType = VSCodeVimCursorType.Block;

constructor() {
super(ModeName.SearchInProgressMode);
Expand Down
2 changes: 1 addition & 1 deletion src/mode/modeVisual.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VSCodeVimCursorType } from './mode';

export class VisualMode extends Mode {
public text = "Visual Mode";
public cursorType = VSCodeVimCursorType.TextDecoration;
public cursorType = VSCodeVimCursorType.Block;
public isVisualMode = true;

constructor() {
Expand Down
2 changes: 1 addition & 1 deletion src/mode/modeVisualLine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VSCodeVimCursorType } from './mode';

export class VisualLineMode extends Mode {
public text = "Visual Line Mode";
public cursorType = VSCodeVimCursorType.TextDecoration;
public cursorType = VSCodeVimCursorType.Block;
public isVisualMode = true;

constructor() {
Expand Down
2 changes: 1 addition & 1 deletion src/mode/surroundInputMode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VSCodeVimCursorType } from './mode';

export class SurroundInputMode extends Mode {
public text = "Surround Input Mode";
public cursorType = VSCodeVimCursorType.Native;
public cursorType = VSCodeVimCursorType.Block;

constructor() {
super(ModeName.SurroundInputMode);
Expand Down