Updated Renjin. Double-click on definition pane inserts the definition name.

Author	djarvis <email>
Date	2017-01-27 19:45:57 GMT-0800
Commit	c617aeda15c3f237487e2547bbcb91f650159e7f
Parent	3a02424

build.gradle

		compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
		compile 'org.apache.commons:commons-configuration2:2.1'
		- compile files('libs/renjin-script-engine-0.8.2320-jar-with-dependencies.jar')
		+ compile files('libs/renjin-script-engine-0.8.2324-jar-with-dependencies.jar')
		}

		-version = '1.2.5'
		+version = '1.2.6'
		applicationName = 'scrivenvar'
		mainClassName = 'com.scrivenvar.Main'

libs/renjin-script-engine-0.8.2320-jar-with-dependencies.jar

Binary files differ

libs/renjin-script-engine-0.8.2324-jar-with-dependencies.jar

Binary files differ

src/main/java/com/scrivenvar/definition/DefinitionPane.java

		import java.util.List;
		import javafx.collections.ObservableList;
		+import javafx.event.EventHandler;
		import javafx.scene.Node;
		import javafx.scene.control.MultipleSelectionModel;
		import javafx.scene.control.SelectionMode;
		import javafx.scene.control.TreeItem;
		import javafx.scene.control.TreeView;
		+import javafx.scene.input.MouseButton;
		+import javafx.scene.input.MouseEvent;

		/**

		setTreeView( root );
		initTreeView();
		+ }
		+
		+ /**
		+ * Allows observers to receive double-click events on the tree view.
		+ *
		+ * @param handler The handler that
		+ */
		+ public void addBranchSelectedListener(
		+ final EventHandler<? super MouseEvent> handler ) {
		+
		+ getTreeView().addEventHandler( MouseEvent.ANY, event -> {
		+ if( event.getButton().equals( MouseButton.PRIMARY ) && event.getClickCount() == 2 ) {
		+ if( event.getEventType().equals( MouseEvent.MOUSE_CLICKED ) ) {
		+ handler.handle( event );
		+ }
		+
		+ event.consume();
		+ }
		+ } );
		}

src/main/java/com/scrivenvar/editors/VariableNameInjector.java

		import javafx.scene.control.IndexRange;
		import javafx.scene.control.TreeItem;
		+import javafx.scene.control.TreeView;
		import javafx.scene.input.InputEvent;
		import javafx.scene.input.KeyCode;

		import static javafx.scene.input.KeyCombination.SHIFT_DOWN;
		import javafx.scene.input.KeyEvent;
		+import javafx.scene.input.MouseEvent;
		import org.fxmisc.richtext.StyledTextArea;
		import org.fxmisc.wellbehaved.event.EventPattern;

		private int initialCaretPosition;

		+ /**
		+ * Empty constructor.
		+ */
		private VariableNameInjector() {
		}

		public static void listen( final FileEditorTab tab, final DefinitionPane pane ) {
		- VariableNameInjector vni = new VariableNameInjector();
		+ final VariableNameInjector vni = new VariableNameInjector();

		vni.setFileEditorTab( tab );
		vni.setDefinitionPane( pane );
		-
		+ vni.initBranchSelectedListener();
		vni.initKeyboardEventListeners();
		+ }
		+
		+ /**
		+ * Traps double-click events on the definition pane.
		+ */
		+ private void initBranchSelectedListener() {
		+ getDefinitionPane().addBranchSelectedListener( (final MouseEvent event) -> {
		+ final Object source = event.getSource();
		+
		+ if( source instanceof TreeView ) {
		+ final TreeView tree = (TreeView)source;
		+ final TreeItem item = (TreeItem)tree.getSelectionModel().getSelectedItem();
		+
		+ if( item instanceof VariableTreeItem ) {
		+ final VariableTreeItem var = (VariableTreeItem)item;
		+ final String text = decorate( var.toPath() );
		+
		+ replaceSelection( text );
		+ }
		+ }
		+ } );
		}



		// Decorate the variable upon exiting vMode.
		- decorateVariable();
		+ decorate();
		}
		break;

		if( leaf != null ) {
		replaceText( boundaries[ 0 ], boundaries[ 1 ], leaf.toPath() );
		- decorateVariable();
		+ decorate();
		expand( leaf );
		}
		}

		/**
		* Called when autocomplete finishes on a valid leaf or when the user presses
		* Enter to finish manual autocomplete.
		*/
		- private void decorateVariable() {
		+ private void decorate() {
		// A little bit of duplication...
		final String paragraph = getCaretParagraph();
		final int[] boundaries = getWordBoundaries( paragraph );
		final String old = paragraph.substring( boundaries[ 0 ], boundaries[ 1 ] );

		- final String newVariable = getVariableDecorator().decorate( old );
		+ final String newVariable = decorate( old );

		final int posEnded = getCurrentCaretPosition();
		final int posBegan = posEnded - old.length();

		getEditor().replaceText( posBegan, posEnded, newVariable );
		+ }
		+
		+ /**
		+ * Called when user double-clicks on a tree view item.
		+ *
		+ * @param variable The variable to decorate.
		+ */
		+ private String decorate( final String variable ) {
		+ return getVariableDecorator().decorate( variable );
		+ }
		+
		+ /**
		+ * Inserts the given string at the current caret position, or replaces
		+ * selected text (if any).
		+ *
		+ * @param s The string to inject.
		+ */
		+ private void replaceSelection( final String s ) {
		+ getEditor().replaceSelection( s );
		}

Delta	75 lines added, 8 lines removed, 67-line increase