resolved merge conflicts

Author: anusreelakshmi934

.github/workflows/build.yaml

@@ -29,8 +29,13 @@ on:
         required: true
         type: boolean
         default: false
+      lsp4ijPrNumber:
+        description: 'Run build with an LSP4IJ PR. Make sure to enter the LSP4IJ PR number in the "Reference/branch/PR for LSP4IJ checkout" input box.'
+        required: true
+        type: boolean
+        default: false
       refLsp4ij:
-        description: 'Reference/branch for Lsp4ij checkout'
+        description: 'Reference/branch/PR for LSP4IJ checkout'
         type: string
         required: true
         default: main
@@ -45,7 +50,48 @@ on:
     branches: [ main ]
 
 jobs:
+  fetch_merge_commit_sha_from_lsp4ij_PR:
+    runs-on: ubuntu-latest
+    outputs:
+      pr_details: ${{ steps.extract.outputs.pr_details }}
+      checkout_name: ${{ steps.extract.outputs.checkout_name }}
+    env:
+      API_URL: https://api.github.com/repos/redhat-developer/lsp4ij/pulls
+      REF_LSP4IJ: ${{ inputs.refLsp4ij }}
+      LSP4IJ_BRANCH: ${{ inputs.lsp4ijBranch }}
+    name: Fetch Commit ${{ inputs.refLsp4ij || '' }}
+    steps:
+      - name: Extract Merge Commit SHA
+        shell: bash
+        id: extract
+        run: |
+          pr_details="${{ env.REF_LSP4IJ }}"
+          checkout_name="${{ env.LSP4IJ_BRANCH }}"
+
+          if [ "${{ inputs.lsp4ijPrNumber }}" == "true" ]; then
+            url="${{ env.API_URL }}/${{ env.REF_LSP4IJ }}"
+            pr_detail=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "$url")
+            pr_details=$(jq -r '.merge_commit_sha' <<< "$pr_detail" | xargs)
+            echo "Merge commit SHA of PR ${{ env.REF_LSP4IJ }}: $pr_details"
+            checkout_name="${{ env.REF_LSP4IJ }}"
+            if [[ "$pr_details" == "null" ]]; then
+              echo "::warning file=::The merge commit SHA of the entered PR is 'null'. Please try again later or use a different PR number."
+            fi
+          elif [ -z "$pr_details" ]; then
+            echo "No LSP4IJ checkout found. Using default case."
+          elif [ -z "$checkout_name" ]; then
+            echo "Merge Commit SHA/Branch Name/Tag : $pr_details"
+            checkout_name="${{ env.REF_LSP4IJ }}"
+          else
+            echo "Merge Commit SHA/Branch Name/Tag : $pr_details"
+          fi
+
+          # Set output for further steps
+          echo "pr_details=$pr_details" >> $GITHUB_OUTPUT
+          echo "checkout_name=$checkout_name" >> $GITHUB_OUTPUT
+
   build:
+    needs: fetch_merge_commit_sha_from_lsp4ij_PR
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -63,8 +109,8 @@ jobs:
             reportName: windows-test-report
     env:
       USE_LOCAL_PLUGIN: ${{ inputs.useLocalPlugin || false }}
-      REF_LSP4IJ: ${{ inputs.refLsp4ij }}
-      LSP4IJ_BRANCH: ${{ inputs.lsp4ijBranch || 'default' }}
+      REF_LSP4IJ: ${{ needs.fetch_merge_commit_sha_from_lsp4ij_PR.outputs.pr_details }}
+      LSP4IJ_BRANCH: ${{ needs.fetch_merge_commit_sha_from_lsp4ij_PR.outputs.checkout_name }}
       REF_LTI_TAG: ${{ inputs.refLTITag }}
     steps:
       - name: Configure pagefile
@@ -95,6 +141,7 @@ jobs:
         if: ${{ inputs.useLocalPlugin == true }}
         working-directory: ./lsp4ij
         run: bash ./gradlew buildPlugin
+      # This step is retained to support the 24.0.9 tag running in the cron job, as it requires an unzipped LSP4IJ.
       - name: 'Unzip lsp4ij file'
         if: ${{ inputs.useLocalPlugin == true }}
         working-directory: ./lsp4ij/build/distributions
@@ -108,7 +155,7 @@ jobs:
         if: ${{ runner.os == 'Linux' && !failure() }}
         uses: actions/[email protected]
         with:
-          name: liberty-tools-intellij-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH }}
+          name: liberty-tools-intellij-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH || 'default' }}
           path: |
             ./**/*liberty-tools-intellij*.zip
             ./**/libs/*liberty-tools-intellij*.jar
@@ -122,6 +169,6 @@ jobs:
         if: ${{ failure() && steps.run_tests.conclusion == 'failure' }}
         uses: actions/[email protected]
         with:
-          name: ${{ matrix.reportName }}-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH }}
+          name: ${{ matrix.reportName }}-LTI-${{ env.REF_LTI_TAG || 'default' }}-LSP4IJ-${{ env.LSP4IJ_BRANCH || 'default' }}
           path: |
             liberty-tools-intellij/build/reports/

.github/workflows/cronJob.yaml

@@ -95,7 +95,7 @@ jobs:
       fail-fast: false
       matrix:
         # Existing LTI release tags and branches can be added to obtain build results.If the tag array is empty, it will default to 'main'. However, if there is at least one tag or branch in the tag array and you need to run on 'main' as well, make sure to add 'main' to the array.
-        tag: [ 'main', '24.0.9', '24.0.12' ] # Can specify tags or branches such as '24.0.6' and 'main'
+        tag: [ 'main', '24.0.9', '24.0.12-lsp4ijFix' ] # Can specify tags or branches such as '24.0.6' and 'main'
         pr_details: ${{ fromJson(needs.fetch_all_pull_request_shas.outputs.pr_details) }}
     with:
       useLocalPlugin: true
@@ -111,7 +111,7 @@ jobs:
       fail-fast: false
       matrix:
         # Existing LTI release tags and branches can be added to obtain build results.If the tag array is empty, it will default to 'main'. However, if there is at least one tag or branch in the tag array and you need to run on 'main' as well, make sure to add 'main' to the array.
-        tag: [ 'main', '24.0.9', '24.0.12' ]
+        tag: [ 'main', '24.0.9', '24.0.12-lsp4ijFix' ]
     with:
       useLocalPlugin: true
       refLsp4ij: main

.github/workflows/pr-slack-notification.yaml

@@ -105,7 +105,7 @@ jobs:
                 draft_status="\n*Draft*: true"
               fi
 
-              pr_list="${pr_list}\n*Pull Request* #${pr_number}: ${pr_title}\n*Created by*: ${pr_user}\n*URL*: ${pr_url}${draft_status}\n*Created At*: ${pr_created_at}\n*Last Updated At*: ${pr_updated_at}\n"
+              pr_list="${pr_list}\n*Pull Request* ${pr_number}: ${pr_title}\n*Created by*: ${pr_user}\n*URL*: ${pr_url}${draft_status}\n*Created At*: ${pr_created_at}\n*Last Updated At*: ${pr_updated_at}\n"
               notify=true
             fi
           done
@@ -134,14 +134,13 @@ jobs:
 
           echo "Last run timestamp: $last_run_timestamp"
           
-          
           # We used 'sort=updated' to fetch list of closed PRs with max limit of 100(Default value). In the future, we expect to have more than 100 closed PRs, so it's better to keep 'sort=updated'.
           closed_prs=$(curl -s -H "Authorization: token ${{ env.GH_TOKEN }}" \
           "${{ env.API_URL }}?state=closed&sort=updated&direction=desc&per_page=100")
           
           closed_pr_list=$(echo "$closed_prs" | jq -r \
           --arg last_run "$last_run_timestamp" \
-          '.[] | select(.closed_at > $last_run) | "*Closed Pull Request* #\(.number): \(.title)\n*Closed by*: \(.user.login)\n*URL*: \(.html_url)\n*Closed At*: \(.closed_at)\n"')
+          '.[] | select(.closed_at > $last_run) | "*Closed Pull Request* \(.number): \(.title)\n*Closed by*: \(.user.login)\n*URL*: \(.html_url)\n*Closed At*: \(.closed_at)\n"')
           
           echo "Closed PR List since last cron job:"
           echo "$closed_pr_list"
@@ -169,6 +168,12 @@ jobs:
           if [ -f closed_pr_list.txt ]; then
             closed_pr_list=$(cat closed_pr_list.txt)
           fi
+          
+          # Prevent Slack from auto-linking issue numbers (e.g., #778) to private channels  
+          # by adding a zero-width space (U+200B) after the `#` symbol.  
+          # This makes the text appear unchanged but prevents unintended Slack formatting.
+          pr_list=$(echo "$pr_list" | sed 's/#/#​/g')
+          closed_pr_list=$(echo "$closed_pr_list" | sed 's/#/#​/g')
 
           # Initialize payload blocks
           payload_blocks=()

build.gradle

@@ -12,7 +12,7 @@ version '25.0.1-SNAPSHOT'
 
 def remoteRobotVersion = "0.11.23"
 // To switch to nightly version, append "@nightly" to the version number (i.e. 0.4.1-20240828-013108@nightly)
-def lsp4ijVersion = '0.8.1'
+def lsp4ijVersion = '0.11.0'
 
 allprojects {
     sourceCompatibility = javaVersion
@@ -148,10 +148,15 @@ dependencies {
         create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
         bundledPlugins providers.gradleProperty("platformBundledPlugins").orElse("").get().split(',').toList()
 
-        def lsp4ij = providers.gradleProperty('useLocal') && providers.gradleProperty('useLocal') == 'true' ?
-                file("../lsp4ij/build/distributions/LSP4IJ/") :
-                'com.redhat.devtools.lsp4ij:' + lsp4ijVersion
-        plugins lsp4ij
+        // Locate the LSP4IJ ZIP file in the distributions directory
+        def lsp4ijZip = file("../lsp4ij/build/distributions").listFiles()?.findAll { it.name.endsWith(".zip") }?.first()
+
+        // If the 'useLocal' Gradle property is set to 'true', use the locally built LSP4IJ plugin;
+        // otherwise, use the specified version in the build.gradle file.
+        providers.gradleProperty("useLocal").get() == 'true' ?
+                localPlugin(lsp4ijZip.absolutePath) :
+                plugin('com.redhat.devtools.lsp4ij', lsp4ijVersion)
+
         pluginVerifier()
         zipSigner()
         instrumentationTools()

docs/LSP4IJ-Continuous-Integration.md

@@ -40,7 +40,7 @@ The build.yaml workflow is triggered by the following events:
 - Workflow Dispatch: Allows manual triggering of the workflow with customizable inputs.
 
 
-  <img alt="Workflow-dispatch" height="300" src="images/Workflow-dispatch.png" width="300" style="display: block; margin: 0 auto;"/>
+  <img alt="Workflow-dispatch" height="400" src="images/Workflow-dispatch.png" width="300" style="display: block; margin: 0 auto;"/>
 
 To manually trigger the workflow, refer to the [Manually Trigger Workflow](#manually-trigger-workflow) section.
 
@@ -209,14 +209,23 @@ LSP4IJ nightly builds can be downloaded from the [JetBrains Marketplace](https:/
 
 ## Manually Trigger Workflow
 To manually trigger the build.yaml workflow , navigate to the [Actions](https://github.com/OpenLiberty/liberty-tools-intellij/actions) tab in the OpenLiberty/liberty-tools-intellij repository. On the left side of the page, select Build Workflow under All workflows. You'll see a message stating, This workflow has a workflow_dispatch event trigger. To the right, there will be a Run workflow button. You can choose the branch from which to run the workflow.
-<img alt="Manually-trigger" height="300" src="images/manually-trigger.png" width="300" style="display: block; margin: 0 auto;"/>
+
+<img alt="Manually-trigger" height="350" src="images/manually-trigger.png" width="300" style="display: block; margin: 0 auto;"/>
 
 If you want to use the version of lsp4ij specified in the build.gradle file, there's no need to check the box labeled Use lsp4ij locally. However, if you want to check out a different tag, merge commit SHA, or specific branch of lsp4ij, you can check the box and specify the branch in the provided field. Additionally, you can specify the tag or branch of liberty-tools-intellij to be used.
 
 
 For example, if you want to trigger the Build Workflow from the `main` branch of the LTI repository and build against version `0.5.0` of LSP4IJ and the `main` branch of LTI, you would configure it as follows:
 
-<img alt="Example" height="300" src="images/example-manually-trigger.png" width="300" style="display: block; margin: 0 auto;"/>
+<img alt="Example" height="400" src="images/example-manually-trigger.png" width="300" style="display: block; margin: 0 auto;"/>
+
+If you want to check out LSP4IJ based on a PR number, you can check the box labeled `Run build with an LSP4IJ PR.` and specify the PR number in the provided text field labeled `Reference/branch/PR for LSP4IJ checkout`. Additionally, you can specify the tag or branch of the `liberty-tools-intellij` repository to be used. 
+
+> NOTE: Make sure to enable the checkbox labeled `Use lsp4ij locally` as well for this case.
+
+For example, if you want to trigger the Build Workflow from a branch of the LTI repository and build against LSP4IJ PR number `500` while using the `main` branch of LTI, you would configure it as follows:
+
+<img alt="Example" height="400" src="images/Allow-developer-to-input-PR-number.png" width="320" style="display: block; margin: 0 auto;"/>
 
 # How to specify LTI tags or branches in CI-CD builds
 

docs/images/Allow-developer-to-input-PR-number.png

@@ -57,10 +57,10 @@ When installing the Liberty Tools for IntelliJ plugin, the latest version of LSP
 
 If you prefer to use an older version of LSP4IJ (e.g., a specific version that was tested with the Liberty Tools release you are using), you can manually downgrade it by installing the desired version as a dependency from the [JetBrains marketplace](https://plugins.jetbrains.com/plugin/23257-lsp4ij/versions).
 
-| Liberty Tools version | LSP4IJ version(s) tested   |
-|-----------------------|----------------------------|
-| 24.0.9                | 0.5.0, 0.6.0, 0.7.0, 0.8.1 |
-| 24.0.12               | 0.8.1, 0.9.0               |
+| Liberty Tools version | LSP4IJ version(s) tested     |
+|-----------------------|------------------------------|
+| 24.0.9                | 0.5.0, 0.6.0, 0.7.0, 0.8.1   |
+| 24.0.12               | 0.8.1, 0.9.0, 0.10.0, 0.11.0 |
 
 
 Steps to install an older version of LSP4IJ: