Support notebook for enable-preview flag from the project context

Author: sid-srini

nbcode/notebooks/src/org/netbeans/modules/nbcode/java/notebook/NotebookSessionManager.java

@@ -130,12 +130,7 @@ private List<String> getCompilerOptions(Project prj) {
         addOption.accept(CLASS_PATH, configs.getClassPath());
         addOption.accept(MODULE_PATH, configs.getModulePath());
         addOption.accept(ADD_MODULES, configs.getAddModules());
-
-        if (configs.isEnablePreview()) {
-            compilerOptions.add(ENABLE_PREVIEW);
-            compilerOptions.add(SOURCE_FLAG);
-            compilerOptions.add(configs.getJdkVersion());
-        }
+        boolean enablePreview = configs.isEnablePreview();
 
         if (prj != null) {
             List<String> projOptions = ProjectConfigurationUtils.compilerOptions(prj);
@@ -153,6 +148,13 @@ private List<String> getCompilerOptions(Project prj) {
             if (checkEmptyString(configs.getAddModules()) && prjConfigMap.containsKey(ADD_MODULES)) {
                 addOption.accept(ADD_MODULES, prjConfigMap.get(ADD_MODULES));
             }
+            enablePreview = enablePreview || projOptions.contains(ENABLE_PREVIEW);
+        }
+
+        if (enablePreview) {
+            compilerOptions.add(ENABLE_PREVIEW);
+            compilerOptions.add(SOURCE_FLAG);
+            compilerOptions.add(configs.getJdkVersion());
         }
 
         return compilerOptions;
@@ -161,7 +163,7 @@ private List<String> getCompilerOptions(Project prj) {
     private List<String> getRemoteVmOptions(Project prj) {
         List<String> remoteOptions = new ArrayList<>();
         NotebookConfigs configs = NotebookConfigs.getInstance();
-        boolean isEnablePreview = configs.isEnablePreview();
+        boolean enablePreview = configs.isEnablePreview();
 
         BiConsumer<String, String> addOption = (flag, value) -> {
             if (!checkEmptyString(value)) {
@@ -174,10 +176,6 @@ private List<String> getRemoteVmOptions(Project prj) {
         addOption.accept(MODULE_PATH, configs.getModulePath());
         addOption.accept(ADD_MODULES, configs.getAddModules());
 
-        if (isEnablePreview) {
-            remoteOptions.add(ENABLE_PREVIEW);
-        }
-
         if (prj != null) {
             List<String> projOptions = ProjectConfigurationUtils.launchVMOptions(prj);
             Map<String, String> prjConfigMap = new HashMap<>();
@@ -194,6 +192,10 @@ private List<String> getRemoteVmOptions(Project prj) {
             if (checkEmptyString(configs.getAddModules()) && prjConfigMap.containsKey(ADD_MODULES)) {
                 addOption.accept(ADD_MODULES, prjConfigMap.get(ADD_MODULES));
             }
+            enablePreview = enablePreview || projOptions.contains(ENABLE_PREVIEW);
+        }
+        if (enablePreview) {
+            remoteOptions.add(ENABLE_PREVIEW);
         }
         return remoteOptions;
     }

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

@@ -23,12 +23,13 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import org.eclipse.lsp4j.jsonrpc.validation.NonNull;
+import org.netbeans.api.annotations.common.NonNull;
 import org.netbeans.api.java.classpath.ClassPath;
 import org.netbeans.api.java.platform.JavaPlatform;
 import org.netbeans.api.java.platform.JavaPlatformManager;
 import org.netbeans.api.java.platform.Specification;
 import org.netbeans.api.java.project.JavaProjectConstants;
+import org.netbeans.api.java.queries.CompilerOptionsQuery;
 import org.netbeans.api.java.queries.UnitTestForSourceQuery;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.SourceGroup;
@@ -50,6 +51,7 @@ public class ProjectConfigurationUtils {
     public final static String MODULE_PATH = "--module-path";
     public final static String ADD_MODULES = "--add-modules";
     public final static String ADD_EXPORTS = "--add-exports";
+    public final static String ENABLE_PREVIEW = "--enable-preview";
 
     public static boolean isNonTestRoot(SourceGroup sg) {
         return UnitTestForSourceQuery.findSources(sg.getRootFolder()).length == 0;
@@ -123,21 +125,72 @@ private static JavaPlatform findPlatform(ClassPath bootCP) {
         return null;
     }
 
+    static boolean isPreviewEnabled(@NonNull Project project, List<FileObject> sourceRoots) {
+        boolean previewEnabled = isPreviewEnabledForAnyProjectSourceRoot(project, sourceRoots);
+        previewEnabled = previewEnabled || isPreviewEnabledForAnyContainedProjects(project);
+        return previewEnabled;
+    }
+
+    private static boolean isPreviewEnabledForAnyContainedProjects(@NonNull Project project) {
+        Set<Project> subProjects = ProjectUtils.getContainedProjects(project, false);
+        if (subProjects != null) {
+            for (Project subProject : subProjects) {
+                if (isPreviewEnabledForAnyProjectSourceRoot(subProject, getNonTestRoots(subProject))) {
+                    return true;
+                }
+            }
+            for (Project subProject : subProjects) {
+                if (isPreviewEnabledForAnyContainedProjects(subProject)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean isPreviewEnabledForAnyProjectSourceRoot(@NonNull Project project, List<FileObject> sourceRoots) {
+        if (sourceRoots == null || sourceRoots.isEmpty()) {
+            FileObject root = project.getProjectDirectory();
+            if (root != null && isPreviewEnabledForSource(root)) {
+                return true;
+            }
+        } else {
+            for (FileObject root : sourceRoots) {
+                if (root != null && isPreviewEnabledForSource(root)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean isPreviewEnabledForSource(@NonNull FileObject source) {
+        CompilerOptionsQuery.Result result = CompilerOptionsQuery.getOptions(source);
+        return result.getArguments().contains(ENABLE_PREVIEW);
+    }
+
     @NonNull
     public static List<String> launchVMOptions(Project project) {
         if (project == null) {
             return new ArrayList<>();
         }
         boolean isModular = ProjectModulePathConfigurationUtils.isModularProject(project);
         if (isModular) {
-            return ProjectModulePathConfigurationUtils.getVmOptions(project);
+            List<String> vmOptions = ProjectModulePathConfigurationUtils.getVmOptions(project);
+            if (isPreviewEnabled(project, getNonTestRoots(project))) {
+                vmOptions.add(ENABLE_PREVIEW);
+            }
+            return vmOptions;
         }
         List<String> vmOptions = new ArrayList<>();
         List<FileObject> roots = getNonTestRoots(project);
         if (!roots.isEmpty()) {
             ClassPath cp = ClassPath.getClassPath(roots.getFirst(), ClassPath.EXECUTE);
             vmOptions.addAll(Arrays.asList(CLASS_PATH, addRoots("", cp)));
         }
+        if (isPreviewEnabled(project, roots)) {
+            vmOptions.add(ENABLE_PREVIEW);
+        }
         return vmOptions;
     }
 
@@ -148,14 +201,21 @@ public static List<String> compilerOptions(Project project) {
         }
         boolean isModular = ProjectModulePathConfigurationUtils.isModularProject(project);
         if (isModular) {
-            return ProjectModulePathConfigurationUtils.getCompileOptions(project);
+            List<String> compileOptions = ProjectModulePathConfigurationUtils.getCompileOptions(project);
+            if (isPreviewEnabled(project, getNonTestRoots(project))) {
+                compileOptions.add(ENABLE_PREVIEW);
+            }
+            return compileOptions;
         }
         List<String> compileOptions = new ArrayList<>();
         List<FileObject> roots = getNonTestRoots(project);
         if (!roots.isEmpty()) {
             ClassPath cp = ClassPath.getClassPath(roots.getFirst(), ClassPath.COMPILE);
             compileOptions.addAll(Arrays.asList(CLASS_PATH, addRoots("", cp)));
         }
+        if (isPreviewEnabled(project, roots)) {
+            compileOptions.add(ENABLE_PREVIEW);
+        }
         return compileOptions;
     }