Merge master into develop

.github/CODEOWNERS

@@ -0,0 +1,7 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# See: https://help.github.com/articles/about-codeowners/
+
+# These owners will be the default owners for everything in the repo.
+*       @hevayo @NipunaRanasinghe

.github/ISSUE_TEMPLATE/type_bug.md

@@ -0,0 +1,24 @@
+---
+name: "Bug Report"
+about: "Report a bug if something is not working as expected"
+labels: 'Type/Bug'
+
+---
+
+**Description:**
+<!-- Give a brief description of the bug -->
+
+**Steps to reproduce:**
+
+**Affected Versions:**
+
+**OS, DB, other environment details and versions:**
+
+**Related Issues (optional):**
+<!-- Any related issues such as sub tasks, issues reported in other repositories (e.g component repositories), similar problems, etc. -->
+
+**Suggested Labels (optional):**
+<!-- Optional comma separated list of suggested labels. Non committers can’t assign labels to issues, so this will help issue creators who are not a committer to suggest possible labels-->
+
+**Suggested Assignees (optional):**
+<!--Optional comma separated list of suggested team members who should attend the issue. Non committers can’t assign issues to assignees, so this will help issue creators who are not a committer to suggest possible assignees-->

.github/ISSUE_TEMPLATE/type_improvement.md

@@ -0,0 +1,22 @@
+---
+name: "Improvement Request"
+about: "Create an improvement request for an existing feature"
+labels: 'Type/Improvement'
+
+---
+
+**Description:**
+<!-- Give a brief description of the improvement -->
+
+**Describe your problem(s)**
+
+**Describe your solution(s)**
+
+**Related Issues (optional):**
+<!-- Any related issues such as sub tasks, issues reported in other repositories (e.g component repositories), similar problems, etc. -->
+
+**Suggested Labels (optional):**
+<!-- Optional comma separated list of suggested labels. Non committers can’t assign labels to issues, so this will help issue creators who are not a committer to suggest possible labels-->
+
+**Suggested Assignees (optional):**
+<!--Optional comma separated list of suggested team members who should attend the issue. Non committers can’t assign issues to assignees, so this will help issue creators who are not a committer to suggest possible assignees-->

.github/ISSUE_TEMPLATE/type_new_feature.md

@@ -0,0 +1,22 @@
+---
+name: "New Feature Request"
+about: "Create a new feature request"
+labels: 'Type/NewFeature'
+
+---
+
+**Description:**
+<!-- Give a brief description of the new feature -->
+
+**Describe your problem(s)**
+
+**Describe your solution(s)**
+
+**Related Issues (optional):**
+<!-- Any related issues such as sub tasks, issues reported in other repositories (e.g component repositories), similar problems, etc. -->
+
+**Suggested Labels (optional):**
+<!-- Optional comma separated list of suggested labels. Non committers can’t assign labels to issues, so this will help issue creators who are not a committer to suggest possible labels-->
+
+**Suggested Assignees (optional):**
+<!--Optional comma separated list of suggested team members who should attend the issue. Non committers can’t assign issues to assignees, so this will help issue creators who are not a committer to suggest possible assignees-->

.github/ISSUE_TEMPLATE/type_task.md

@@ -0,0 +1,20 @@
+---
+name: "Task"
+about: "Create a task which you want to keep track"
+labels: 'Type/Task'
+
+---
+
+**Description:**
+<!-- Give a brief description of the task -->
+
+**Describe your task(s)**
+
+**Related Issues (optional):**
+<!-- Any related issues such as sub tasks, issues reported in other repositories (e.g component repositories), similar problems, etc. -->
+
+**Suggested Labels (optional):**
+<!-- Optional comma separated list of suggested labels. Non committers can’t assign labels to issues, so this will help issue creators who are not a committer to suggest possible labels-->
+
+**Suggested Assignees (optional):**
+<!--Optional comma separated list of suggested team members who should attend the issue. Non committers can’t assign issues to assignees, so this will help issue creators who are not a committer to suggest possible assignees-->

.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['8', '11']
+        java_version: ['11']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: actions/checkout@v1

.github/workflows/stale_check.yml

@@ -0,0 +1,19 @@
+name: 'Close stale pull requests'
+
+on:
+  schedule:
+    - cron: '30 19 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v3
+        with:
+          stale-pr-message: 'This PR has been open for more than 15 days with no activity. This will be closed in 3 days unless the `stale` label is removed or commented.'
+          close-pr-message: 'Closed PR due to inactivity for more than 18 days.'
+          days-before-pr-stale: 15
+          days-before-pr-close: 3
+          days-before-issue-stale: -1
+          days-before-issue-close: -1

README.md

@@ -43,89 +43,10 @@ For instructions on adding **Lsp4IntelliJ** as a dependency when using the below
   - sbt
 
 >**Info:** - The Maven publishing process is currently WIP. Thus, the possibility to add LSP4IntelliJ as a dependency will be available soon in the Maven central.
-
-### 2. Add the language server definition
-
-1. Instantiate a concrete subclass of the
-[LanguageServerDefinition](src/main/java/org/wso2/lsp4intellij/client/languageserver/serverdefinition/LanguageServerDefinition.java).
-
-    You can use the following concrete class:
-
-    - **RawCommandServerDefinition(string fileExtension, string[] command)** 
-
-        This definition can be used to start a language server using a command. 
-
-        * You can specify multiple extensions for a server by separating them with a comma (e.g., "ts,js").
-
-        * If you want to bind your language server definition only with a specific set of files, you can use that 
-        specific file pattern as a regex expression instead of binding with the file extension (e.g., "application*.properties").
-
-        Examples: 
-
-        Ballerina Language Server 
-        ```java
-        new RawCommandServerDefinition("bal", new String[]{"path/to/launcher-script.sh"});
-        ```
-
-        BSL Language Server
-        ```java
-        String[] command = new String[]{"java","-jar","path/to/language-server.jar"};
-        new RawCommandServerDefinition("bsl,os",command);
-        ```
-
-   - **ProcessBuilderServerDefinition(string fileExtension, string[] command)** 
-
-       This definition is an extended form of the **RawCommandServerDefinition**, which accepts 
-       `java.lang.ProcessBuilder` instances so that the users will have more controllability over the language
-        server
-        process to be created.
-
-       * You can specify multiple extensions for a server by separating them with a comma (e.g., "ts,js").
-
-       * If you want to bind your language server definition only with a specific set of files, you can use that 
-       specific file pattern as a regex expression instead of binding with the file extension (e.g., "application*.properties").
-
-       Examples: 
-
-       Ballerina Language Server 
-       ```java
-       ProcessBuilder process = new ProcessBuilder("path/to/launcher-script.sh");
-       new ProcessBuilderServerDefinition("bal", process);
-       ```
-
-       BSL Language Server
-       ```java
-       ProcessBuilder process = new ProcessBuilder("java","-jar","path/to/language-server.jar");
-       new ProcessBuilderServerDefinition("bsl,os", process);
-       ```
-
-    > **Note:** All of the above implementations will use server stdin/stdout to communicate.
-
-2. To register any of the aforementioned options, implement a preloading activity in your plugin as shown 
-below.
-
->**Tip:** For other options you can use instead of implementing a preloading activity, go to [InteliJ Plugin initialization on startup](https://www.plugin-dev.com/intellij/general/plugin-initial-load/) 
-to)
 
-Example:
-
-```java
-public class BallerinaPreloadingActivity extends PreloadingActivity {
-    IntellijLanguageClient.addServerDefinition(new RawCommandServerDefinition("bal", new String[]{"path/to/launcher-script.sh"}));
-}
-```
-
-With plugin.xml containing;
-
-```xml
-<extensions defaultExtensionNs="com.intellij">
-    <preloadingActivity implementation="io.ballerina.plugins.idea.preloading.BallerinaPreloadingActivity" 
-                        id="io.ballerina.plugins.idea.preloading.BallerinaPreloadingActivity" />
-</extensions>
-```
-
-### 3. Add configurations to the plugin.xml file
-
+### 2. Add a plugin.xml file
+<details>
+<summary>deprecated "components"-based setup</summary>
   1. Add `IntellijLanguageClient` as an application component. 
        ```xml
        <application-components>
@@ -194,10 +115,93 @@ With plugin.xml containing;
             ```
 
    > **Note:** You do not need any additional configurations for the other features.
-
+</details>
+
+Copy the example plugin.xml [here](resources/plugin.xml.example) and place it under `src/resources/META-INF` in your plugin and adjust it to your needs.
+
+### 3. Add a preloading activity to configure LSP
+
+Implement a preloading activity in your plugin as shown below.
+
+>**Tip:** For other options you can use instead of implementing a preloading activity, go to [InteliJ Plugin initialization on startup](https://www.plugin-dev.com/intellij/general/plugin-initial-load/)
+to)
+
+Example:
+
+```java
+public class BallerinaPreloadingActivity extends PreloadingActivity {
+    public void preload(ProgressIndicator indicator) {
+        IntellijLanguageClient.addServerDefinition(new RawCommandServerDefinition("bal", new String[]{"path/to/launcher-script.sh"}));
+    }
+}
+```
+
+With plugin.xml containing;
+
+```xml
+<extensions defaultExtensionNs="com.intellij">
+    <preloadingActivity implementation="io.ballerina.plugins.idea.preloading.BallerinaPreloadingActivity" 
+                        id="io.ballerina.plugins.idea.preloading.BallerinaPreloadingActivity" />
+</extensions>
+```
+
 If you have connected to your language server successfully, you will see a green icon at the bottom-right side of your 
 IDE when opening a file that has a registered file extension as shown below.
 
+#### Alternative ways to connect to a language server
+Aside RawCommandServerDefinition there are several classes implementing [LanguageServerDefinition](src/main/java/org/wso2/lsp4intellij/client/languageserver/serverdefinition/LanguageServerDefinition.java).
+
+You can use the following concrete class:
+
+- **RawCommandServerDefinition(string fileExtension, string[] command)**
+
+  This definition can be used to start a language server using a command.
+
+    * You can specify multiple extensions for a server by separating them with a comma (e.g., "ts,js").
+
+    * If you want to bind your language server definition only with a specific set of files, you can use that
+      specific file pattern as a regex expression instead of binding with the file extension (e.g., "application*.properties").
+
+  Examples:
+
+  Ballerina Language Server
+    ```java
+    new RawCommandServerDefinition("bal", new String[]{"path/to/launcher-script.sh"});
+    ```
+
+  BSL Language Server
+    ```java
+    String[] command = new String[]{"java","-jar","path/to/language-server.jar"};
+    new RawCommandServerDefinition("bsl,os",command);
+    ```
+
+- **ProcessBuilderServerDefinition(string fileExtension, string[] command)**
+
+  This definition is an extended form of the **RawCommandServerDefinition**, which accepts
+  `java.lang.ProcessBuilder` instances so that the users will have more controllability over the language
+  server
+  process to be created.
+
+    * You can specify multiple extensions for a server by separating them with a comma (e.g., "ts,js").
+
+    * If you want to bind your language server definition only with a specific set of files, you can use that
+      specific file pattern as a regex expression instead of binding with the file extension (e.g., "application*.properties").
+
+  Examples:
+
+  Ballerina Language Server
+    ```java
+    ProcessBuilder process = new ProcessBuilder("path/to/launcher-script.sh");
+    new ProcessBuilderServerDefinition("bal", process);
+    ```
+
+  BSL Language Server
+    ```java
+    ProcessBuilder process = new ProcessBuilder("java","-jar","path/to/language-server.jar");
+    new ProcessBuilderServerDefinition("bsl,os", process);
+    ```
+> **Note:** All of the above implementations will use server stdin/stdout to communicate.
+
 ![](resources/images/lang-server-connect.gif)
 
 >**Tip:** You can also click on the icon to see the connected files and the timeouts.

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "jacoco"
-    id "org.jetbrains.intellij" version "0.4.9"
+    id "org.jetbrains.intellij" version "0.7.3"
     id "com.github.hierynomus.license" version "0.15.0"
     id "com.github.gradle-git-version-calculator" version "1.1.0"
     id 'net.researchgate.release' version '2.6.0'
@@ -14,23 +14,29 @@ repositories {
     mavenCentral()
 }
 
+tasks{
+    runPluginVerifier {
+        ideVersions = "2021.1"
+    }
+}
+
 group = "org.wso2.lsp4intellij"
 version = gitVersionCalculator.calculateVersion("v")
 
 intellij {
-    version '2020.1'
+    version '2021.1'
     type 'IC'
     updateSinceUntilBuild false
 }
 
 dependencies {
     compile group: 'org.eclipse.lsp4j', name: 'org.eclipse.lsp4j', version: '0.10.0'
-    compile group: 'com.vladsch.flexmark', name: 'flexmark', version: '0.34.58'
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
-    testCompile group: 'junit', name: 'junit', version: '4.11'
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
-    testCompile group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.5'
-    testCompile group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.5'
+    compile group: 'com.vladsch.flexmark', name: 'flexmark', version: '0.34.60'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    testCompile group: 'junit', name: 'junit', version: '4.13.2'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '3.9.0'
+    testCompile group: 'org.powermock', name: 'powermock-api-mockito2', version: '2.0.9'
+    testCompile group: 'org.powermock', name: 'powermock-module-junit4', version: '2.0.9'
 }
 
 sourceSets {
@@ -41,6 +47,9 @@ sourceSets {
     }
 }
 
+sourceCompatibility = 11
+targetCompatibility = 11
+
 license {
     header = rootProject.file("resources/license/HEADER.txt")
     ext["year"] = Calendar.getInstance().get(Calendar.YEAR)