Initialize R when necessary, and on preferences change

Author	DaveJarvis <email>
Date	2022-05-29 12:49:22 GMT-0700
Commit	91f92022bde0eae5929c278a5a5f7960ca6193b6
Parent	dbd6437
Delta	34 lines added, 25 lines removed, 9-line increase

src/main/java/com/keenwrite/processors/r/RBootstrapController.java

		package com.keenwrite.processors.r;

		-import com.keenwrite.processors.ProcessorContext;
		+import com.keenwrite.preferences.Workspace;
		import com.keenwrite.sigils.RKeyOperator;

		import java.util.HashMap;
		+import java.util.Map;
		+import java.util.function.Supplier;

		import static com.keenwrite.events.StatusEvent.clue;
		+import static com.keenwrite.preferences.AppKeys.KEY_R_DIR;
		+import static com.keenwrite.preferences.AppKeys.KEY_R_SCRIPT;
		import static com.keenwrite.processors.r.RVariableProcessor.escape;
		import static com.keenwrite.processors.text.TextReplacementFactory.replace;

		private final static RKeyOperator KEY_OPERATOR = new RKeyOperator();

		- private RBootstrapController() {}
		+ private final Workspace mWorkspace;
		+ private final Supplier<Map<String, String>> mDefinitions;
		+
		+ public RBootstrapController(
		+ final Workspace workspace,
		+ final Supplier<Map<String, String>> supplier ) {
		+ mWorkspace = workspace;
		+ mDefinitions = supplier;
		+
		+ mWorkspace.stringProperty( KEY_R_SCRIPT )
		+ .addListener( ( c, o, n ) -> update() );
		+ mWorkspace.fileProperty( KEY_R_DIR )
		+ .addListener( ( c, o, n ) -> update() );
		+ }

		/**
		- * Initializes the R code so that R can find imported libraries. Note that
		+ * Updates the R code so that R can find imported libraries. Note that
		* any existing R functionality will not be overwritten if this method is
		* called multiple times.
		- * <p>
		- * If the R code to bootstrap contained variables, and they were all updated
		- * successfully, this will update the internal ready flag to {@code true}.
		*/
		- public static void init( final ProcessorContext context ) {
		- final var bootstrap = context.getRScript();
		+ public void update() {
		+ final var bootstrap = getRScript();

		if( !bootstrap.isBlank() ) {
		- final var wd = context.getRWorkingDir();
		- final var dir = wd.toString().replace( '\\', '/' );
		- final var definitions = context.getDefinitions();
		+ final var dir = getRWorkingDirectory();
		+ final var definitions = mDefinitions.get();
		final var map = new HashMap<String, String>( definitions.size() + 1 );


		}
		}
		+ }
		+
		+ private String getRScript() {
		+ return mWorkspace.getString( KEY_R_SCRIPT );
		+ }
		+
		+ private String getRWorkingDirectory() {
		+ final var wd = mWorkspace.getFile( KEY_R_DIR );
		+ return wd.toString().replace( '\\', '/' );
		}
		}

src/main/java/com/keenwrite/processors/r/RChunkEvaluator.java

		package com.keenwrite.processors.r;

		-import com.keenwrite.processors.ProcessorContext;
		-
		import java.util.function.Function;


		*/
		public final class RChunkEvaluator implements Function<String, String> {
		-
		- private final ProcessorContext mContext;

		/**
		* Constructs an evaluator capable of executing R statements.
		- *
		- * @param context Used to initialize the {@link RBootstrapController}.
		*/
		- public RChunkEvaluator( final ProcessorContext context ) {
		- mContext = context;
		- }
		+ public RChunkEvaluator() {}

		/**

		public String apply( final String r ) {
		try {
		- RBootstrapController.init( mContext );
		return Engine.eval( r );
		} catch( final Exception ex ) {

src/main/java/com/keenwrite/processors/r/RInlineEvaluator.java


		private final Processor<String> mProcessor;
		- private final ProcessorContext mContext;

		/**
		* Constructs an evaluator capable of executing R statements.
		*/
		public RInlineEvaluator( final ProcessorContext context ) {
		mProcessor = new RVariableProcessor( IDENTITY, context );
		- mContext = context;
		}


		int began;
		int ended;
		-
		- RBootstrapController.init( mContext );

		while( (began = text.indexOf( PREFIX, index )) >= 0 ) {