fixed jshell flow

Author: Achal1607

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/project/CommandHandler.java

@@ -35,11 +35,19 @@ public class CommandHandler {
     public static CompletableFuture<List<String>> openJshellInProjectContext(List<Object> args) {
         LOG.log(Level.FINER, "Request received for opening Jshell instance with project context {0}", args);
 
-        String uri = NotebookUtils.getArgument(args, 0, String.class);
-
-        CompletableFuture<Project> prjFuture = uri == null ? ProjectContext.getProject()
-                : CompletableFuture.completedFuture(ProjectContext.getProject(uri));
-
+        String context = NotebookUtils.getArgument(args, 0, String.class);
+        String additionalContext = NotebookUtils.getArgument(args, 1, String.class);
+        CompletableFuture<Project> prjFuture;
+        
+        if (context != null) {
+            prjFuture = CompletableFuture.completedFuture(ProjectContext.getProject(context));
+        } else {
+            Project editorPrj = additionalContext != null ? ProjectContext.getProject(additionalContext) : null;
+            prjFuture = editorPrj != null
+                    ? ProjectContext.getProject(false, new ProjectContextInfo(editorPrj))
+                    : ProjectContext.getProject();
+        }
+        
         return prjFuture.thenCompose(prj -> {
             if (prj == null) {
                 return CompletableFuture.completedFuture(new ArrayList<>());
@@ -48,7 +56,7 @@ public static CompletableFuture<List<String>> openJshellInProjectContext(List<Ob
                     .thenCompose(isBuildSuccess -> {
                         if (isBuildSuccess) {
                             List<String> vmOptions = ProjectConfigurationUtils.launchVMOptions(prj);
-                            LOG.log(Level.INFO, "Opened Jshell instance with project context {0}", uri);
+                            LOG.log(Level.INFO, "Opened Jshell instance with project context {0}", context);
                             return CompletableFuture.completedFuture(vmOptions);
                         } else {
                             CompletableFuture<List<String>> failed = new CompletableFuture<>();

vscode/package.json

@@ -603,7 +603,7 @@
 				"command": "jdk.notebook.change.project",
 				"title": "%jdk.notebook.change.project%",
 				"category": "Java",
-				"icon" : "$(pencil)"
+				"icon": "$(pencil)"
 			}
 		],
 		"keybindings": [

vscode/src/commands/notebook.ts

@@ -120,7 +120,8 @@ const openJshellInContextOfProject = async (ctx: any) => {
     try {
         let client: LanguageClient = await globalState.getClientPromise().client;
         if (await isNbCommandRegistered(nbCommands.openJshellInProject)) {
-            const res: string[] = await commands.executeCommand(nbCommands.openJshellInProject, ctx?.toString());
+            const additionalContext = window.activeTextEditor?.document.uri.toString();
+            const res = await commands.executeCommand<string[]>(nbCommands.openJshellInProject, ctx?.toString(), additionalContext);
             const { envMap, finalArgs } = passArgsToTerminal(res);
             // Direct sendText is not working since it truncates the command exceeding a certain length.
             // Open issues on vscode: 130688, 134324 and many more