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

Jump to bottom

Added tag text to status bar in surround mode #1254

Merged
merged 1 commit into from
Jan 31, 2017
Merged

Added tag text to status bar in surround mode #1254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/mode/modeHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1670,12 +1670,12 @@ export class ModeHandler implements vscode.Disposable {
this.vimState.postponedCodeViewChanges = [];

if (this.currentMode.name === ModeName.SearchInProgressMode) {
this.setStatusBarText(`Searching for: ${ this.vimState.globalState.searchState!.searchString }`);
this.setStatusBarText(`Searching for: ${this.vimState.globalState.searchState!.searchString}`);
} else if (this.currentMode.name === ModeName.EasyMotionMode) {
// Update all EasyMotion decorations
this._vimState.easyMotion.updateDecorations();

this.setStatusBarText(`Current depth: ${ this.vimState.easyMotion.accumulation }`);
this.setStatusBarText(`Current depth: ${this.vimState.easyMotion.accumulation}`);
} else {
this._renderStatusBar();
}
Expand All @@ -1697,6 +1697,15 @@ export class ModeHandler implements vscode.Disposable {
currentCommandText = ` ${ this._vimState.globalState.searchState!.searchString }`;
}

if (this._vimState.currentMode === ModeName.SurroundInputMode) {
if (this._vimState.surround !== undefined) {
const surroundText = this._vimState.surround.replacement;
if (surroundText !== undefined) {
currentCommandText = surroundText;
}
}
}

this.setStatusBarText(`${ modeText }${ currentCommandText }${ macroText }`);
}

Expand Down