Merge pull request #15848 from NipunaRanasinghe/pr/add-jballerina-sup…

…port [IntelliJ Plugin] Migrate to 'jballerina' command
ballerina-platform · Jun 20, 2019 · 5ee56b9 · 5ee56b9
2 parents 77443df + b6afdc7
commit 5ee56b9
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 42 deletions.
diff --git a/tool-plugins/intellij/src/main/java/io/ballerina/plugins/idea/BallerinaConstants.java b/tool-plugins/intellij/src/main/java/io/ballerina/plugins/idea/BallerinaConstants.java
@@ -20,6 +20,9 @@
 import com.intellij.openapi.wm.ToolWindowId;
 import org.jetbrains.annotations.NonNls;
 
+import java.io.File;
+import java.util.regex.Pattern;
+
 /**
  * Contains constants related to Ballerina plugin.
  */
@@ -36,13 +39,15 @@ private BallerinaConstants() {
     public static final String BALLERINA_ORG_NAME = "ballerina";
 
     @NonNls
-    public static final String BALLERINA_EXECUTABLE_NAME = "ballerina";
+    public static final String BALLERINA_EXECUTABLE_NAME = "jballerina";
 
     @NonNls
     public static final String BALLERINA_VERSION_FILE_PATH = "bin/version.txt";
     @NonNls
     public static final String BALLERINA_NEW_VERSION_FILE_PATH = "lib/version.txt";
 
+    public static final Pattern BALLERINA_VERSION_PATTERN = Pattern.compile("(\\d+\\.\\d+(\\.\\d+)?(-.+)?)");
+
     public static final NotificationGroup BALLERINA_NOTIFICATION_GROUP =
             NotificationGroup.balloonGroup("Ballerina plugin notifications");
 
@@ -65,4 +70,14 @@ private BallerinaConstants() {
     public static final String BALLERINA_TEST_FILE_SUFFIX = "_test.bal";
 
     public static final String BALLERINA_CONFIG_FILE_NAME = "Ballerina.toml";
+
+    public static final String BALLERINAX_SOURCE_PATH = "lib/repo";
+    public static final String LAUNCHER_SCRIPT_PATH = "lib/tools/lang-server/launcher";
+    public static final String BALLERINA_EXEC_PATH = "bin" + File.separator + BALLERINA_EXECUTABLE_NAME;
+
+    public static final String BALLERINA_LS_LAUNCHER_PATH = "lib/tools/lang-server/launcher";
+    public static final String BALLERINA_LS_LAUNCHER_NAME = "language-server-launcher";
+    public static final String BALLERINA_COMPOSER_LIB_PATH = "lib/tools/composer-library";
+
+
 }
diff --git a/.../java/io/ballerina/plugins/idea/configuration/BallerinaLibrariesConfigurableProvider.java b/.../java/io/ballerina/plugins/idea/configuration/BallerinaLibrariesConfigurableProvider.java
@@ -33,7 +33,7 @@
 import com.intellij.util.containers.ContainerUtil;
 import io.ballerina.plugins.idea.project.BallerinaApplicationLibrariesService;
 import io.ballerina.plugins.idea.project.BallerinaProjectLibrariesService;
-import io.ballerina.plugins.idea.sdk.BallerinaSdkUtil;
+import io.ballerina.plugins.idea.sdk.BallerinaSdkUtils;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -116,7 +116,7 @@ public JComponent createComponent() {
             protected List<UnnamedConfigurable> createConfigurables() {
                 List<UnnamedConfigurable> result = ContainerUtil.newArrayList();
                 String[] urlsFromEnv =
-                        ContainerUtil.map2Array(BallerinaSdkUtil.getBallerinaPathsRootsFromEnvironment(), String.class,
+                        ContainerUtil.map2Array(BallerinaSdkUtils.getBallerinaPathsRootsFromEnvironment(), String.class,
                                 VirtualFile::getUrl);
                 result.add(new BallerinaLibrariesConfigurable("Global libraries",
                         BallerinaApplicationLibrariesService.getInstance(), urlsFromEnv));

diff --git a/...ellij/src/main/java/io/ballerina/plugins/idea/configuration/BallerinaSdkConfigurable.java b/...ellij/src/main/java/io/ballerina/plugins/idea/configuration/BallerinaSdkConfigurable.java
@@ -52,7 +52,7 @@
 import com.intellij.util.ui.AsyncProcessIcon;
 import com.intellij.util.ui.UIUtil;
 import io.ballerina.plugins.idea.sdk.BallerinaSdkService;
-import io.ballerina.plugins.idea.sdk.BallerinaSdkUtil;
+import io.ballerina.plugins.idea.sdk.BallerinaSdkUtils;
 import io.ballerina.plugins.idea.sdk.BallerinaSmallIDEsSdkService;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
@@ -118,12 +118,12 @@ public void apply() throws ConfigurationException {
                 libraryModel.removeRoot(libUrl, OrderRootType.CLASSES);
             }
 
-            String sdkPath = BallerinaSdkUtil.adjustSdkPath(mySdkPathField.getText());
-            String versionString = BallerinaSdkUtil.retrieveBallerinaVersion(sdkPath);
+            String sdkPath = BallerinaSdkUtils.adjustSdkPath(mySdkPathField.getText());
+            String versionString = BallerinaSdkUtils.retrieveBallerinaVersion(sdkPath);
             boolean toRemove = StringUtil.isEmpty(sdkPath) || versionString == null;
 
             if (!toRemove) {
-                for (VirtualFile file : BallerinaSdkUtil.getSdkDirectoriesToAttach(sdkPath, versionString)) {
+                for (VirtualFile file : BallerinaSdkUtils.getSdkDirectoriesToAttach(sdkPath, versionString)) {
                     libraryModel.addRoot(file, OrderRootType.CLASSES);
                 }
             }
@@ -151,7 +151,7 @@ public void reset() {
     @Override
     public boolean isModified() {
         String currentPath = StringUtil.notNullize(BallerinaSdkService.getInstance(myProject).getSdkHomePath(null));
-        return !BallerinaSdkUtil.adjustSdkPath(mySdkPathField.getText()).equals(currentPath);
+        return !BallerinaSdkUtils.adjustSdkPath(mySdkPathField.getText()).equals(currentPath);
     }
 
     @NotNull
@@ -210,7 +210,7 @@ private void asyncUpdateSdkVersion(@NotNull String sdkPath) {
         if (!myAlarm.isDisposed()) {
             myAlarm.cancelAllRequests();
             myAlarm.addRequest(() -> {
-                String version = BallerinaSdkUtil.retrieveBallerinaVersion(BallerinaSdkUtil.adjustSdkPath(sdkPath));
+                String version = BallerinaSdkUtils.retrieveBallerinaVersion(BallerinaSdkUtils.adjustSdkPath(sdkPath));
                 ApplicationManager.getApplication().invokeLater(() -> {
                     if (!Disposer.isDisposed(myDisposable)) {
                         setVersion(version);
@@ -266,7 +266,7 @@ public MyBrowseFolderListener(@NotNull FileChooserDescriptor descriptor) {
         @Nullable
         @Override
         protected VirtualFile getInitialFile() {
-            return ObjectUtils.chooseNotNull(super.getInitialFile(), BallerinaSdkUtil.suggestSdkDirectory());
+            return ObjectUtils.chooseNotNull(super.getInitialFile(), BallerinaSdkUtils.suggestSdkDirectory());
         }
     }
 

diff --git a/...ellij/src/main/java/io/ballerina/plugins/idea/preloading/BallerinaPreloadingActivity.java b/...ellij/src/main/java/io/ballerina/plugins/idea/preloading/BallerinaPreloadingActivity.java
@@ -27,7 +27,7 @@
 import io.ballerina.plugins.idea.extensions.BallerinaLSPExtensionManager;
 import io.ballerina.plugins.idea.sdk.BallerinaPathModificationTracker;
 import io.ballerina.plugins.idea.sdk.BallerinaSdk;
-import io.ballerina.plugins.idea.sdk.BallerinaSdkUtil;
+import io.ballerina.plugins.idea.sdk.BallerinaSdkUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.wso2.lsp4intellij.IntellijLanguageClient;
@@ -36,6 +36,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import static io.ballerina.plugins.idea.BallerinaConstants.BALLERINAX_SOURCE_PATH;
+import static io.ballerina.plugins.idea.BallerinaConstants.LAUNCHER_SCRIPT_PATH;
 import static io.ballerina.plugins.idea.preloading.OperatingSystemUtils.getOperatingSystem;
 
 /**
@@ -44,8 +46,6 @@
 public class BallerinaPreloadingActivity extends PreloadingActivity {
 
     private static final Logger LOGGER = Logger.getInstance(BallerinaPreloadingActivity.class);
-    private static final String BALLERINA_SOURCE_PATH = "lib/repo";
-    private static final String LAUNCHER_SCRIPT_PATH = "lib/tools/lang-server/launcher";
 
     /**
      * Preloading of the ballerina plugin.
@@ -90,7 +90,7 @@ private static void registerServerDefinition() {
 
     private static boolean registerServerDefinition(Project project) {
 
-        BallerinaSdk balSdk = BallerinaSdkUtil.getBallerinaSdkFor(project);
+        BallerinaSdk balSdk = BallerinaSdkUtils.getBallerinaSdkFor(project);
         if (balSdk.hasLangServerSupport()) {
             return doRegister(balSdk.getSdkPath());
         }
@@ -119,11 +119,11 @@ private static boolean doRegister(@NotNull String sdkPath) {
     }
 
     private static void updateBallerinaPathModificationTracker(Project project, ProjectStatus status) {
-        BallerinaSdk balSdk = BallerinaSdkUtil.getBallerinaSdkFor(project);
+        BallerinaSdk balSdk = BallerinaSdkUtils.getBallerinaSdkFor(project);
         if (balSdk.getSdkPath() == null) {
             return;
         }
-        Path balxPath = Paths.get(balSdk.getSdkPath(), BALLERINA_SOURCE_PATH);
+        Path balxPath = Paths.get(balSdk.getSdkPath(), BALLERINAX_SOURCE_PATH);
         if (balxPath.toFile().isDirectory()) {
             if (status == ProjectStatus.OPENED) {
                 BallerinaPathModificationTracker.addPath(balxPath.toString());

diff --git a/...src/main/java/io/ballerina/plugins/idea/project/BallerinaApplicationLibrariesService.java b/...src/main/java/io/ballerina/plugins/idea/project/BallerinaApplicationLibrariesService.java
@@ -21,7 +21,7 @@
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import io.ballerina.plugins.idea.BallerinaConstants;
-import io.ballerina.plugins.idea.sdk.BallerinaSdkUtil;
+import io.ballerina.plugins.idea.sdk.BallerinaSdkUtils;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -49,7 +49,7 @@ public boolean isUseBallerinaPathFromSystemEnvironment() {
     public void setUseBallerinaPathFromSystemEnvironment(boolean useBallerinaPathFromSystemEnvironment) {
         if (myState.isUseBallerinaPathFromSystemEnvironment() != useBallerinaPathFromSystemEnvironment) {
             myState.setUseBallerinaPathFromSystemEnvironment(useBallerinaPathFromSystemEnvironment);
-            if (!BallerinaSdkUtil.getBallerinaPathsRootsFromEnvironment().isEmpty()) {
+            if (!BallerinaSdkUtils.getBallerinaPathsRootsFromEnvironment().isEmpty()) {
                 incModificationCount();
                 ApplicationManager.getApplication().getMessageBus().syncPublisher(LIBRARIES_TOPIC)
                         .librariesChanged(getLibraryRootUrls());

diff --git a/.../src/main/java/io/ballerina/plugins/idea/project/BallerinaModuleLibrariesInitializer.java b/.../src/main/java/io/ballerina/plugins/idea/project/BallerinaModuleLibrariesInitializer.java
@@ -52,7 +52,7 @@
 import io.ballerina.plugins.idea.BallerinaConstants;
 import io.ballerina.plugins.idea.configuration.BallerinaLibrariesConfigurableProvider;
 import io.ballerina.plugins.idea.sdk.BallerinaSdkService;
-import io.ballerina.plugins.idea.sdk.BallerinaSdkUtil;
+import io.ballerina.plugins.idea.sdk.BallerinaSdkUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
@@ -280,7 +280,7 @@ public void run() {
             Project project = myModule.getProject();
             if (BallerinaSdkService.getInstance(project).isBallerinaModule(myModule)) {
                 synchronized (myLastHandledBallerinaPathSourcesRoots) {
-                    Collection<VirtualFile> ballerinaPathSourcesRoots = BallerinaSdkUtil.getBallerinaPathRoots(project,
+                    Collection<VirtualFile> ballerinaPathSourcesRoots = BallerinaSdkUtils.getBallerinaPathRoots(project,
                             myModule);
                     Set<VirtualFile> excludeRoots =
                             ContainerUtil.newHashSet(ProjectRootManager.getInstance(project).getContentRoots());

diff --git a/...ugins/intellij/src/main/java/io/ballerina/plugins/idea/psi/impl/BallerinaPsiImplUtil.java b/...ugins/intellij/src/main/java/io/ballerina/plugins/idea/psi/impl/BallerinaPsiImplUtil.java
@@ -40,7 +40,7 @@
 import io.ballerina.plugins.idea.psi.BallerinaReturnType;
 import io.ballerina.plugins.idea.psi.BallerinaTupleTypeName;
 import io.ballerina.plugins.idea.psi.BallerinaTypeName;
-import io.ballerina.plugins.idea.sdk.BallerinaSdkUtil;
+import io.ballerina.plugins.idea.sdk.BallerinaSdkUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -163,7 +163,7 @@ public static VirtualFile findFileInProjectSDK(@NotNull Project project, @NotNul
 
     @Nullable
     public static VirtualFile getSDKSrcRoot(@NotNull Project project, @Nullable Module module) {
-        LinkedHashSet<VirtualFile> sources = BallerinaSdkUtil.getSourcesPathsToLookup(project, module);
+        LinkedHashSet<VirtualFile> sources = BallerinaSdkUtils.getSourcesPathsToLookup(project, module);
         if (sources.isEmpty()) {
             return null;
         }

diff --git a/...llij/src/main/java/io/ballerina/plugins/idea/runconfig/BallerinaRunConfigurationBase.java b/...llij/src/main/java/io/ballerina/plugins/idea/runconfig/BallerinaRunConfigurationBase.java
@@ -41,7 +41,7 @@
 import com.intellij.util.containers.ContainerUtil;
 import io.ballerina.plugins.idea.BallerinaConstants;
 import io.ballerina.plugins.idea.sdk.BallerinaSdkService;
-import io.ballerina.plugins.idea.sdk.BallerinaSdkUtil;
+import io.ballerina.plugins.idea.sdk.BallerinaSdkUtils;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -107,7 +107,7 @@ public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEn
     @NotNull
     @Override
     public Collection<Module> getValidModules() {
-        return BallerinaSdkUtil.getBallerinaModules(getProject());
+        return BallerinaSdkUtils.getBallerinaModules(getProject());
     }
 
     @Override

diff --git a/tool-plugins/intellij/src/main/java/io/ballerina/plugins/idea/sdk/BallerinaSdkType.java b/tool-plugins/intellij/src/main/java/io/ballerina/plugins/idea/sdk/BallerinaSdkType.java
@@ -63,7 +63,7 @@ public Icon getIconForAddAction() {
     @Nullable
     @Override
     public String suggestHomePath() {
-        VirtualFile suggestSdkDirectory = BallerinaSdkUtil.suggestSdkDirectory();
+        VirtualFile suggestSdkDirectory = BallerinaSdkUtils.suggestSdkDirectory();
         return suggestSdkDirectory != null ? suggestSdkDirectory.getPath() : null;
     }
 
@@ -105,7 +105,7 @@ public String suggestSdkName(@Nullable String currentSdkName, @NotNull String sd
     @Nullable
     @Override
     public String getVersionString(@NotNull String sdkHome) {
-        return BallerinaSdkUtil.retrieveBallerinaVersion(sdkHome);
+        return BallerinaSdkUtils.retrieveBallerinaVersion(sdkHome);
     }
 
     @Nullable
@@ -145,7 +145,7 @@ public void setupSdkPaths(@NotNull Sdk sdk) {
         }
         modificator.setHomePath(path);
 
-        for (VirtualFile file : BallerinaSdkUtil.getSdkDirectoriesToAttach(path, versionString)) {
+        for (VirtualFile file : BallerinaSdkUtils.getSdkDirectoriesToAttach(path, versionString)) {
             modificator.addRoot(file, OrderRootType.CLASSES);
             modificator.addRoot(file, OrderRootType.SOURCES);
         }

diff --git a/...na/plugins/idea/sdk/BallerinaSdkUtil.java → ...a/plugins/idea/sdk/BallerinaSdkUtils.java b/...na/plugins/idea/sdk/BallerinaSdkUtil.java → ...a/plugins/idea/sdk/BallerinaSdkUtils.java
@@ -51,20 +51,23 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import static com.intellij.util.containers.ContainerUtil.newLinkedHashSet;
+import static io.ballerina.plugins.idea.BallerinaConstants.BALLERINA_COMPOSER_LIB_PATH;
+import static io.ballerina.plugins.idea.BallerinaConstants.BALLERINA_EXECUTABLE_NAME;
+import static io.ballerina.plugins.idea.BallerinaConstants.BALLERINA_EXEC_PATH;
+import static io.ballerina.plugins.idea.BallerinaConstants.BALLERINA_LS_LAUNCHER_NAME;
+import static io.ballerina.plugins.idea.BallerinaConstants.BALLERINA_LS_LAUNCHER_PATH;
+import static io.ballerina.plugins.idea.BallerinaConstants.BALLERINA_VERSION_PATTERN;
 
 /**
  * Contains util classes related to Ballerina SDK.
  */
-public class BallerinaSdkUtil {
+public class BallerinaSdkUtils {
 
-    private static final Pattern BALLERINA_VERSION_PATTERN = Pattern.compile("(\\d+\\.\\d+(\\.\\d+)?(-.+)?)");
     private static final Key<String> VERSION_DATA_KEY = Key.create("BALLERINA_VERSION_KEY");
-    private static final String BALLERINA_EXEC_PATH = "bin" + File.separator + "ballerina";
 
-    private BallerinaSdkUtil() {
+    private BallerinaSdkUtils() {
 
     }
 
@@ -196,8 +199,8 @@ private static boolean isValidSdk(String sdkPath) {
             return false;
         }
         // Checks for either shell scripts or batch files, since the shell script recognition error in windows.
-        String balShellScript = Paths.get(sdkPath, "bin", "ballerina").toString();
-        String balBatchScript = Paths.get(sdkPath, "bin", "ballerina.bat").toString();
+        String balShellScript = Paths.get(sdkPath, "bin", BALLERINA_EXECUTABLE_NAME).toString();
+        String balBatchScript = Paths.get(sdkPath, "bin", BALLERINA_EXECUTABLE_NAME).toString() + ".bat";
 
         return (new File(balShellScript).exists() || new File(balBatchScript).exists());
     }
@@ -208,10 +211,10 @@ private static boolean hasLangServerSupport(String sdkPath) {
             return false;
         }
         // Checks for either shell scripts or batch files, since the shell script recognition error in windows.
-        String launcherShellScript = Paths.get(sdkPath, "lib", "tools", "lang-server", "launcher",
-                "language-server-launcher.sh").toString();
-        String launcherBatchScript = Paths.get(sdkPath, "lib", "tools", "lang-server", "launcher",
-                "language-server-launcher.bat").toString();
+        String launcherShellScript = Paths.get(sdkPath, BALLERINA_LS_LAUNCHER_PATH,
+                BALLERINA_LS_LAUNCHER_NAME).toString() + ".sh";
+        String launcherBatchScript = Paths.get(sdkPath, BALLERINA_LS_LAUNCHER_PATH,
+                BALLERINA_LS_LAUNCHER_NAME).toString() + ".bat";
 
         return new File(launcherShellScript).exists() || new File(launcherBatchScript).exists();
     }
@@ -222,7 +225,7 @@ private static boolean hasWebviewSupport(String sdkPath) {
             return false;
         }
         // Checks for composer library resource directory existence.
-        String composerLib = Paths.get(sdkPath, "lib", "tools", "composer-library").toString();
+        String composerLib = Paths.get(sdkPath, BALLERINA_COMPOSER_LIB_PATH).toString();
         return new File(composerLib).exists();
     }
 

diff --git a/...ns/intellij/src/main/java/io/ballerina/plugins/idea/sdk/BallerinaSmallIDEsSdkService.java b/...ns/intellij/src/main/java/io/ballerina/plugins/idea/sdk/BallerinaSmallIDEsSdkService.java
@@ -86,7 +86,7 @@ public String getSdkVersion(@Nullable Module module) {
             String result = null;
             String sdkHomePath = getSdkHomePath(module);
             if (sdkHomePath != null) {
-                result = BallerinaSdkUtil.retrieveBallerinaVersion(sdkHomePath);
+                result = BallerinaSdkUtils.retrieveBallerinaVersion(sdkHomePath);
             }
             return CachedValueProvider.Result.create(result, this);
         });

diff --git a/...rc/main/java/io/ballerina/plugins/idea/webview/diagram/preview/BallerinaDiagramUtils.java b/...rc/main/java/io/ballerina/plugins/idea/webview/diagram/preview/BallerinaDiagramUtils.java
@@ -28,7 +28,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import io.ballerina.plugins.idea.sdk.BallerinaSdk;
-import io.ballerina.plugins.idea.sdk.BallerinaSdkUtil;
+import io.ballerina.plugins.idea.sdk.BallerinaSdkUtils;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -79,7 +79,7 @@ static String generateDiagramHtml(@NotNull VirtualFile file, DiagramHtmlPanel pa
         Editor editor = getEditorFor(file, project);
 
         // Retrieves attached ballerina SDk of the project.
-        BallerinaSdk balSdk = BallerinaSdkUtil.getBallerinaSdkFor(project);
+        BallerinaSdk balSdk = BallerinaSdkUtils.getBallerinaSdkFor(project);
         if (balSdk.getSdkPath() == null) {
             LOG.warn(String.format("No Ballerina SDK is found for the project: %s", project.getName()));
             return "";