Improve executing ginitvim

akiyosi · May 27, 2022 · 1981682 · 1981682
1 parent ba31c2c
commit 1981682
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/editor/editor.go b/editor/editor.go
@@ -645,6 +645,9 @@ func (e *Editor) setFont() {
 	e.app.SetFont(gui.NewQFont2(e.extFontFamily, e.extFontSize, 1, false), "QLabel")
 }
 
+// pushNotification is
+//   level: notify level
+//   period: display period
 func (e *Editor) pushNotification(level NotifyLevel, p int, message string, opt ...NotifyOptionArg) {
 	a := NotifyOptions{}
 	for _, o := range opt {

diff --git a/editor/workspace.go b/editor/workspace.go
@@ -818,9 +818,11 @@ func (w *Workspace) initGonvim() {
 
 func (w *Workspace) loadGinitVim() {
 	if editor.config.Editor.GinitVim != "" {
-		scripts := strings.NewReplacer(`'`, `''`, "\r\n", "\n", "\r", "\n", "\n", "\n").Replace(editor.config.Editor.GinitVim)
-		execGinitVim := fmt.Sprintf(`call execute(split('%s', '\n'))`, scripts)
-		w.nvim.Command(execGinitVim)
+		var result bool
+		_, err := w.nvim.Exec(editor.config.Editor.GinitVim, result)
+		if err != nil {
+			editor.pushNotification(NotifyWarn, 0, "An error occurs while processing Vimscript in Ginitvim.\n"+err.Error(), notifyOptionArg([]*NotifyButton{}))
+		}
 	}
 }