[WIP] Allow the passing of a custom init.vim path. (#784)

* Allow the passing of a custom init.vim path. * Fixed linting error. * Consolidated loading init vim and choosing path in to one option. Also refactored the opening of the init.vim to use the existing open command. * Renamed variable. * Fixed linting issues.
onivim · Oct 12, 2017 · 4bf40fd · 4bf40fd
1 parent 64ebbe5
commit 4bf40fd
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/browser/src/Services/Commands.ts b/browser/src/Services/Commands.ts
@@ -53,7 +53,7 @@ export const registerBuiltInCommands = (commandManager: CommandManager, pluginMa
         // Menu commands
         new CallbackCommand("oni.config.openConfigJs", "Edit Oni Config", "Edit configuration file ('config.js') for Oni", () => openDefaultConfig(neovimInstance)),
 
-        new CallbackCommand("oni.config.openInitVim", "Edit Neovim Config", "Edit configuration file ('init.vim') for Neovim", () => neovimInstance.open("$MYVIMRC")),
+        new CallbackCommand("oni.config.openInitVim", "Edit Neovim Config", "Edit configuration file ('init.vim') for Neovim", () => neovimInstance.openInitVim()),
 
         new CallbackCommand("oni.openFolder", "Open Folder", "Set a folder as the working directory for Oni", () => openFolder(neovimInstance)),
 

diff --git a/browser/src/Services/Configuration/IConfigurationValues.ts b/browser/src/Services/Configuration/IConfigurationValues.ts
@@ -38,7 +38,8 @@ export interface IConfigurationValues {
 
     // By default, user's init.vim is not loaded, to avoid conflicts.
     // Set this to `true` to enable loading of init.vim.
-    "oni.loadInitVim": boolean
+    // Set this to a string to override the init.vim path.
+    "oni.loadInitVim": string | boolean
 
     // Sets the `popupmenu_external` option in Neovim
     // This will override the default UI to show a consistent popupmenu,

diff --git a/browser/src/neovim/NeovimInstance.ts b/browser/src/neovim/NeovimInstance.ts
@@ -109,6 +109,7 @@ export interface INeovimInstance {
     getApiVersion(): Promise<INeovimApiVersion>
 
     open(fileName: string): Promise<void>
+    openInitVim(): Promise<void>
 
     executeAutoCommand(autoCommand: string): Promise<void>
 }
@@ -324,6 +325,16 @@ export class NeovimInstance extends EventEmitter implements INeovimInstance {
         return this.command(`e! ${fileName}`)
     }
 
+    public openInitVim(): Promise<void> {
+        const loadInitVim = configuration.getValue("oni.loadInitVim")
+
+        if (typeof(loadInitVim) === "string") {
+            return this.open(loadInitVim)
+        } else {
+            return this.open("$MYVIMRC")
+        }
+    }
+
     public eval<T>(expression: string): Promise<T> {
         return this._neovim.request("nvim_eval", [expression])
     }

diff --git a/browser/src/neovim/NeovimProcessSpawner.ts b/browser/src/neovim/NeovimProcessSpawner.ts
@@ -37,12 +37,17 @@ export const startNeovim = (runtimePaths: string[], args: string[]): Session =>
                                     .map((p) => remapPathToUnpackedAsar(p))
                                     .join(",")
 
-    const shouldLoadInitVim = configuration.getValue("oni.loadInitVim")
+    const loadInitVimConfigOption = configuration.getValue("oni.loadInitVim")
     const useDefaultConfig = configuration.getValue("oni.useDefaultConfig")
 
-    const vimRcArg = (shouldLoadInitVim || !useDefaultConfig) ? [] : ["-u", noopInitVimPath]
+    let initVimArg = []
+    initVimArg = (loadInitVimConfigOption || !useDefaultConfig) ? [] : ["-u", noopInitVimPath]
 
-    const argsToPass = vimRcArg
+    if (typeof(loadInitVimConfigOption) === "string") {
+        initVimArg = ["-u", loadInitVimConfigOption]
+    }
+
+    const argsToPass = initVimArg
         .concat(["--cmd", `let &rtp.='${joinedRuntimePaths}'`, "--cmd", "let g:gui_oni = 1", "-N", "--embed", "--"])
         .concat(args)