refactoring - removing CodeEvaluator dependency on JShell

Author: andrus

jjava-kernel/src/main/java/org/dflib/jjava/kernel/JavaKernel.java

@@ -229,7 +229,7 @@ private List<String> formatEvaluationInterruptedException(EvaluationInterruptedE
 
     @Override
     protected Object doEval(String source, EvalTimer timer) {
-        return evaluator.eval(source, timer);
+        return evaluator.eval(jShell, source, timer);
     }
 
     @Override
@@ -331,7 +331,7 @@ public ReplacementOptions complete(String code, int at) {
 
     @Override
     public String isComplete(String code) {
-        return this.evaluator.isComplete(code);
+        return evaluator.isComplete(jShell.sourceCodeAnalysis(), code);
     }
 
     @Override
@@ -342,7 +342,7 @@ public void onShutdown(boolean isRestarting) {
 
     @Override
     public void interrupt() {
-        this.evaluator.interrupt();
+        evaluator.interrupt();
     }
 
     /**
@@ -369,8 +369,10 @@ public JavaKernel build() {
 
             String name = buildName();
             Charset jupyterEncoding = buildJupyterIOEncoding();
-            JJavaExecutionControlProvider jShellExecutionControlProvider = buildJShellExecControlProvider(name);
-            JShell jShell = buildJShell(jShellExecutionControlProvider);
+            JJavaExecutionControlProvider execControlProvider = buildJShellExecControlProvider(name);
+            CodeEvaluator evaluator = buildCodeEvaluator(name, execControlProvider);
+
+            JShell jShell = buildJShell(execControlProvider);
             LanguageInfo langInfo = buildLanguageInfo();
             MagicTranspiler magicTranspiler = buildMagicTranspiler();
 
@@ -388,7 +390,7 @@ public JavaKernel build() {
                     buildExtensionsEnabled(),
                     buildErrorStyler(),
                     jShell,
-                    buildCodeEvaluator(jShell, jShellExecutionControlProvider)
+                    evaluator
             );
         }
 

jjava-kernel/src/main/java/org/dflib/jjava/kernel/JavaKernelBuilder.java

@@ -71,8 +71,8 @@ protected JShell buildJShell(JJavaExecutionControlProvider jShellExecControlProv
                 .build();
     }
 
-    protected CodeEvaluator buildCodeEvaluator(JShell jShell, JJavaExecutionControlProvider jShellExecControlProvider) {
-        return new CodeEvaluator(jShell, jShellExecControlProvider, jShellExecControlID);
+    protected CodeEvaluator buildCodeEvaluator(String name, JJavaExecutionControlProvider execControlProvider) {
+        return new CodeEvaluator(name, execControlProvider, jShellExecControlID);
     }
 
     protected MagicsResolver buildMagicsResolver(MagicTranspiler transpiler) {

jjava-kernel/src/main/java/org/dflib/jjava/kernel/execution/CodeEvaluator.java

@@ -20,6 +20,7 @@ public class CodeEvaluator {
     private static final Pattern LAST_LINE = Pattern.compile("(?:^|\r?\n)(?<last>.*)$");
 
     private static final String NO_MAGIC_RETURN = "\"__NO_MAGIC_RETURN\"";
+    private static final String INDENTATION = "  ";
 
     private static final Method SNIPPET_CLASS_NAME_METHOD;
 
@@ -32,33 +33,32 @@ public class CodeEvaluator {
         }
     }
 
-    private static final String INDENTATION = "  ";
 
-    private final JShell shell;
+    private final String name;
     private final JJavaExecutionControlProvider execControlProvider;
     private final String execControlID;
-    private final SourceCodeAnalysis sourceAnalyzer;
 
     public CodeEvaluator(
-            JShell shell,
+            String name,
             JJavaExecutionControlProvider execControlProvider,
             String execControlID) {
 
-        this.shell = shell;
+        this.name = name;
         this.execControlProvider = execControlProvider;
         this.execControlID = execControlID;
-        this.sourceAnalyzer = shell.sourceCodeAnalysis();
     }
 
-    public Object eval(String code, EvalTimer timer) {
+    public Object eval(JShell shell, String code, EvalTimer timer) {
+
+        SourceCodeAnalysis sca = shell.sourceCodeAnalysis();
 
         Object lastResult = null;
-        SourceCodeAnalysis.CompletionInfo info = this.sourceAnalyzer.analyzeCompletion(code);
+        SourceCodeAnalysis.CompletionInfo info = sca.analyzeCompletion(code);
 
         while (info.completeness().isComplete()) {
 
-            lastResult = evalSingle(info.source(), timer);
-            info = sourceAnalyzer.analyzeCompletion(info.remaining());
+            lastResult = evalSingle(shell, info.source(), timer);
+            info = sca.analyzeCompletion(info.remaining());
         }
 
         if (info.completeness() != SourceCodeAnalysis.Completeness.EMPTY) {
@@ -68,7 +68,7 @@ public Object eval(String code, EvalTimer timer) {
         return lastResult;
     }
 
-    protected Object evalSingle(String code, EvalTimer timer) {
+    protected Object evalSingle(JShell shell, String code, EvalTimer timer) {
 
         JJavaExecutionControl execControl = execControlProvider.getRegisteredControlByID(execControlID);
         List<SnippetEvent> events = timer.runAndMeasureStep(() -> shell.eval(code));
@@ -80,7 +80,7 @@ protected Object evalSingle(String code, EvalTimer timer) {
         for (SnippetEvent event : events) {
             if (event.status() == Snippet.Status.OVERWRITTEN) {
                 // if a new snippet changed some other definition, drop the older one
-                dropSnippet(event.snippet());
+                dropSnippet(shell, event.snippet());
                 continue;
             }
 
@@ -146,7 +146,7 @@ protected Object evalSingle(String code, EvalTimer timer) {
     /**
      * Try to clean up information linked to a code snippet and the snippet itself
      */
-    private void dropSnippet(Snippet snippet) {
+    private void dropSnippet(JShell shell, Snippet snippet) {
         JJavaExecutionControl execControl = execControlProvider.getRegisteredControlByID(execControlID);
         shell.drop(snippet);
         // snippet.classFullName() returns name of a wrapper class created for a snippet
@@ -211,8 +211,8 @@ private String computeIndentation(String partialStatement) {
                 : currentIndentation;
     }
 
-    public String isComplete(String code) {
-        SourceCodeAnalysis.CompletionInfo info = this.sourceAnalyzer.analyzeCompletion(code);
+    public String isComplete(SourceCodeAnalysis sourceAnalyzer, String code) {
+        SourceCodeAnalysis.CompletionInfo info = sourceAnalyzer.analyzeCompletion(code);
         while (info.completeness().isComplete()) {
             info = sourceAnalyzer.analyzeCompletion(info.remaining());
         }
@@ -228,7 +228,7 @@ public String isComplete(String code) {
             case CONSIDERED_INCOMPLETE:
             case DEFINITELY_INCOMPLETE:
                 // Compute the indent of the last line and match it
-                return this.computeIndentation(info.remaining());
+                return computeIndentation(info.remaining());
             default:
                 // For completeness, return an "I don't know" if we somehow get down here
                 return BaseKernel.IS_COMPLETE_MAYBE;