Skip to content

Commit

Permalink
Fix vimrc.path containing $HOME (#7360)
Browse files Browse the repository at this point in the history
- Handle vimrc path with $home variable correctly after saving vimrc file
- Fix vim.editVimrc command's error with vimrcPath's $HOME variable
- Display warning message when no vimrcPath is found

Fixes #7359, fixes #7358
  • Loading branch information
waynewaynetsai committed Jan 2, 2022
1 parent 3a729d7 commit 214118d
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions extensionBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { taskQueue } from './src/taskQueue';
import { Register } from './src/register/register';
import { SpecialKeys } from './src/util/specialKeys';
import { HistoryTracker } from './src/history/historyTracker';
import { vimrc } from './src/configuration/vimrc';

let extensionContext: vscode.ExtensionContext;
let previousActiveEditorUri: vscode.Uri | undefined;
Expand Down Expand Up @@ -216,7 +217,8 @@ export async function activate(context: vscode.ExtensionContext, handleLocal: bo
registerEventListener(context, vscode.workspace.onDidSaveTextDocument, async (document) => {
if (
configuration.vimrc.enable &&
path.relative(document.fileName, configuration.vimrc.path) === ''
vimrc.vimrcPath &&
path.relative(document.fileName, vimrc.vimrcPath) === ''
) {
await configuration.load();
vscode.window.showInformationMessage('Sourced new .vimrc');
Expand Down Expand Up @@ -493,8 +495,12 @@ export async function activate(context: vscode.ExtensionContext, handleLocal: bo
context,
'vim.editVimrc',
async () => {
const document = await vscode.workspace.openTextDocument(configuration.vimrc.path);
await vscode.window.showTextDocument(document);
if (vimrc.vimrcPath) {
const document = await vscode.workspace.openTextDocument(vimrc.vimrcPath);
await vscode.window.showTextDocument(document);
} else {
await vscode.window.showWarningMessage('No .vimrc found. Please set `vim.vimrc.path.`');
}
},
false
);
Expand Down

0 comments on commit 214118d

Please sign in to comment.