TODO Fold

Author: jgehrig

src/gui/runtime/plugin/nvim_gui_shim.vim

@@ -216,7 +216,6 @@ function GuiShowContextMenu() range
 	call rpcnotify(0, 'Gui', 'ShowContextMenu')
 endfunction
 
-<<<<<<< HEAD
 " Notify Gui of any cursor movement, used by GuiScrollBar
 function s:GuiCursorMovedUpdateScrollBar()
 	let l:minLineVisible = line('w0')

src/gui/shell.cpp

@@ -167,14 +167,11 @@ bool Shell::setGuiFont(const QString& fdesc, bool force, bool updateOption)
 	// unwanted recursion. Only update this option for ':GuiFont', and dialog calls.
 	if (isGuiDialogRequest || updateOption) {
 		m_nvim->api0()->vim_set_option("guifont", fontDesc());
-
-	bool ok = setShellFont(attrs.at(0), pointSize, weight, italic, force);
-	if (ok && m_attached) {
-		m_cmdlineWidget.setFont(font());
-		resizeNeovim(size());
-		m_nvim->api0()->vim_set_var("GuiFont", fontDesc());
 	}
 
+	// Update ext_cmdline font to match ShellWidget
+	m_cmdlineWidget.setFont(font());
+
 	return true;
 }
 
@@ -566,12 +563,7 @@ void Shell::handleRedraw(const QByteArray& name, const QVariantList& opargs)
 		handleGridCursorGoto(opargs);
 	} else if (name == "grid_scroll") {
 		handleGridScroll(opargs);
-	} else if (name == "hl_group_set") {
 	}
-	else {
-		qDebug() << "Received unknown redraw notification" << name << opargs;
-	}
-
 }
 
 void Shell::handlePopupMenuShow(const QVariantList& opargs)
@@ -899,8 +891,6 @@ void Shell::handleExtGuiOption(const QString& name, const QVariant& value)
 		m_nvim->api2()->nvim_ui_set_option("ext_popupmenu", value.toBool());
 	} else if (name == "Cmdline") {
 		m_nvim->api2()->nvim_ui_set_option("ext_cmdline", value.toBool());
-	} else {
-		qDebug() << "Unknown GUI Option" << name << value;
 	}
 }
 
@@ -927,8 +917,6 @@ void Shell::handleSetOption(const QString& name, const QVariant& value)
 	} else if (name == "termguicolors") {
 	} else if (name == "ext_cmdline") {
 	} else if (name == "ext_linegrid") {
-	} else {
-		qDebug() << "Received unknown option" << name << value;
 	}
 }
 

src/gui/shell.h

@@ -11,11 +11,7 @@
 #include <QList>
 #include <QMap>
 #include <QMenu>
-<<<<<<< HEAD
-
-=======
 #include "cmdline/extcmdlinewidget.h"
->>>>>>> 819b127... Add support of extcmdline
 #include "neovimconnector.h"
 #include "shellwidget/highlight.h"
 #include "shellwidget/shellwidget.h"
@@ -154,11 +150,10 @@ protected slots:
 	virtual void handleGridCursorGoto(const QVariantList& opargs);
 	virtual void handleGridScroll(const QVariantList& opargs);
 
-<<<<<<< HEAD
 	// GuiScrollBar Slots
 	virtual void handleCursorMovedUpdateScrollBar(const QVariantList& opargs) noexcept;
 	virtual void handleSetScrollBarVisible(const QVariantList& opargs) noexcept;
-=======
+
 	// External/Gui commandline handling'ext_cmdline'
 	virtual void handleCmdlineShow(const QVariantList& opargs);
 	virtual void handleCmdlinePos(const QVariantList& opargs);
@@ -167,7 +162,6 @@ protected slots:
 	virtual void handleCmdlineBlockShow(const QVariantList& opargs);
 	virtual void handleCmdlineBlockAppend(const QVariantList& opargs);
 	virtual void handleCmdlineBlockHide();
->>>>>>> 819b127... Add support of extcmdline
 
 	void neovimMouseEvent(QMouseEvent *ev);
 	virtual void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE;
@@ -222,15 +216,12 @@ private slots:
 	bool m_neovimBusy{ false };
 	ShellOptions m_options;
 	PopupMenu m_pum{ this };
-<<<<<<< HEAD
 	bool m_mouseEnabled{ true };
 
 	/// GuiScrollBar last known position: used to compute scroll line delta.
 	int m_lastScrollBarPosition{ 0 };
-=======
+
 	Cmdline::ExtCmdlineWidget m_cmdlineWidget{ this };
-	bool m_mouseEnabled;
->>>>>>> 819b127... Add support of extcmdline
 };
 
 class ShellRequestHandler: public QObject, public MsgpackRequestHandler