Merge branch 'main' into query-chat-timeout

leigaol · web-flow · commit 6f0773be6232 · 2024-11-12T14:57:49.000-08:00
diff --git a/.changes/next-release/bugfix-418aac17-9702-451e-8880-9c41b3441574.json b/.changes/next-release/bugfix-418aac17-9702-451e-8880-9c41b3441574.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix a bug when Amazon Q responds with still indexing message even when `@workspace` index is done"
+}
diff --git a/.changes/next-release/bugfix-4a387896-7a93-4474-a86d-f6dc5d53ab57.json b/.changes/next-release/bugfix-4a387896-7a93-4474-a86d-f6dc5d53ab57.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix issue where Amazon Q inline chat can be invoked from non-editor windows"
+}
diff --git a/.github/workflows/generateUpdatesXml.py b/.github/workflows/generateUpdatesXml.py
@@ -13,6 +13,9 @@
     xml = ['<?xml version="1.0" encoding="UTF-8"?>', '<plugins>']
 
     buildRegex = r'.*(\d{3}).zip'
+    # given plugin-amazonq-3.39-SNAPSHOT-1731096007-241.zip,
+    # capture 3.39-SNAPSHOT-1731096007-241 in group 1
+    versionRegex = r'.*?\-(\d.*-\d{3})\.zip'
     for asset in data['assets']:
         name = asset['name']
         if ('plugin-amazonq' in name):
@@ -21,9 +24,13 @@
             plugin = 'aws.toolkit.core'
         else:
             plugin = 'aws.toolkit'
-        build = re.match(buildRegex, name).group(1)
+        build = re.match(buildRegex, name)
+        if build == None:
+            continue
+        build = build.group(1)
+        version = re.match(versionRegex, name).group(1)
 
-        xml.append(f'''<plugin id="{plugin}" url="{asset['url']}" version="999">
+        xml.append(f'''<plugin id="{plugin}" url="{asset['url']}" version="{version}">
     <idea-version since-build="{build}" until-build="{build}.*"/>
 </plugin>''')
 
diff --git a/.github/workflows/q-mega-prerelease.yml b/.github/workflows/q-mega-prerelease.yml
@@ -0,0 +1,164 @@
+name: Prerelease Q-only
+on:
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag name for release'
+        required: false
+        default: prerelease
+  push:
+    branches: [ feature/q-mega ]
+
+jobs:
+  time:
+    outputs:
+      time: ${{ steps.time.outputs.time }}
+    runs-on: ubuntu-latest
+    steps:
+      - id: time
+        run: |
+          echo "time=$(date +%s)" >> "$GITHUB_OUTPUT"          
+
+  generate_artifact_q:
+    needs: [ time ]
+    strategy:
+      matrix:
+        supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: remove unwanted dependencies
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '21'
+      - name: Generate artifact
+        run: |
+          sed -i.bak "s/\(toolkitVersion\s*=\s*\)\(.*\)/\1\2-${{ needs.time.outputs.time }}/" gradle.properties
+          ./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-amazonq:buildPlugin
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: plugin-amazonq-${{ matrix.supported_versions }}
+          path: ./plugins/amazonq/build/distributions/*.zip
+          retention-days: 1
+
+  generate_artifact_core:
+    needs: [ time ]
+    strategy:
+      matrix:
+        supported_versions: [ '2023.3', '2024.1', '2024.2', '2024.3' ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: remove unwanted dependencies
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '21'
+
+      - name: Generate artifact
+        run: |
+          sed -i.bak "s/\(toolkitVersion\s*=\s*\)\(.*\)/\1\2-${{ needs.time.outputs.time }}/" gradle.properties
+          ./gradlew -PideProfileName=${{ matrix.supported_versions }} :plugin-core:buildPlugin
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: plugin-core-${{ matrix.supported_versions }}
+          path: ./plugins/core/build/distributions/*.zip
+          retention-days: 1
+
+  generate_changelog:
+    needs: [ time ]
+    runs-on: ubuntu-latest
+    outputs:
+      feature: ${{ steps.assign_output.outputs.feature }}
+      tagname: ${{ steps.assign_output.outputs.tagname }}
+      version: ${{ steps.assign_output.outputs.version }}
+      changes: ${{ steps.assign_output.outputs.changes }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '21'
+
+      - if: github.event_name == 'workflow_dispatch'
+        run: |
+          echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+      - if: github.ref_name != 'main'
+        run: |
+          TAG_NAME=${{ github.ref_name }}
+          FEAT_NAME=$(echo $TAG_NAME | sed 's/feature\///')
+          echo "FEAT_NAME=$FEAT_NAME" >> $GITHUB_ENV
+          echo "TAG_NAME=pre-$FEAT_NAME" >> $GITHUB_ENV
+      - if: github.ref_name == 'main'
+        run: |
+          echo "FEAT_NAME=" >> $GITHUB_ENV
+          echo "TAG_NAME=prerelease" >> $GITHUB_ENV
+      - name: Generate changelog
+        id: changelog
+        run: |
+          sed -i.bak "s/\(toolkitVersion\s*=\s*\)\(.*\)/\1\2-${{ needs.time.outputs.time }}/" gradle.properties
+          ./gradlew :createRelease :generateChangelog
+      - name: Provide the metadata to output
+        id: assign_output
+        run: |
+          echo "feature=$FEAT_NAME" >> $GITHUB_OUTPUT
+          echo "tagname=$TAG_NAME" >> $GITHUB_OUTPUT
+          echo "version=$(cat gradle.properties | grep toolkitVersion | cut -d'=' -f2)" >> $GITHUB_OUTPUT
+          echo 'changes<<EOF' >> $GITHUB_OUTPUT
+          cat CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print; exit if $. == 1' >> $GITHUB_OUTPUT
+          echo 'EOF' >> $GITHUB_OUTPUT
+
+  publish:
+    needs: [ generate_artifact_core, generate_artifact_q, generate_changelog ]
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_REPO: ${{ github.repository }}
+      FEAT_NAME: ${{ needs.generate_changelog.outputs.feature }}
+      TAG_NAME: ${{ needs.generate_changelog.outputs.tagname }}
+      AWS_TOOLKIT_VERSION: ${{ needs.generate_changelog.outputs.version }}
+      BRANCH: ${{ github.ref_name }}
+      AWS_TOOLKIT_CHANGES: ${{ needs.generate_changelog.outputs.changes }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+      - name: Delete existing prerelease
+        # "prerelease" (main branch) or "pre-<feature>"
+        if: "env.TAG_NAME == 'prerelease' || startsWith(env.TAG_NAME, 'pre-')"
+        run: |
+          echo "SUBJECT=AWS Toolkit ${AWS_TOOLKIT_VERSION}: ${FEAT_NAME:-${TAG_NAME}}" >> $GITHUB_ENV
+          gh release delete "$TAG_NAME" --cleanup-tag --yes || true
+      - name: Publish to GitHub Releases
+        run: |
+          envsubst < "$GITHUB_WORKSPACE/.github/workflows/prerelease_notes.md" > "$RUNNER_TEMP/prerelease_notes.md"
+          gh release create "$TAG_NAME" --prerelease --notes-file "$RUNNER_TEMP/prerelease_notes.md" --title "$SUBJECT" --target $GITHUB_SHA
+      - name: Publish core
+        run: |
+          gh release upload "$TAG_NAME" plugin-core-*/*.zip
+      - name: Publish Q
+        run: |
+          gh release upload "$TAG_NAME" plugin-amazonq-*/*.zip
+      - name: Publish XML manifest
+        run: |
+          gh release view "$TAG_NAME" --repo "$GITHUB_REPOSITORY" --json assets | python3 "$GITHUB_WORKSPACE/.github/workflows/generateUpdatesXml.py" - > updatePlugins.xml
+          gh release upload "$TAG_NAME" updatePlugins.xml
diff --git a/.github/workflows/qodana-check.yml b/.github/workflows/qodana-check.yml
@@ -3,9 +3,9 @@ name: Qodana
 on:
   workflow_dispatch:
   push:
-    branches: [ main ]
+    branches: [ main, feature/** ]
   pull_request:
-    branches: [ main, feature/* ]
+    branches: [ '**' ]
 
 concurrency:
   group: ${{ github.workflow }}${{ github.event.pull_request.number || github.ref }}
diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
@@ -142,42 +142,42 @@ object IdeVersions {
         Profile(
             name = "2024.3",
             gateway = ProductProfile(
-                sdkVersion = "243.19420-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "243.21565-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = listOf("org.jetbrains.plugins.terminal")
             ),
             community = ProductProfile(
-                sdkVersion = "243.19420-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "243.21565-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = commonPlugins + listOf(
                     "com.intellij.java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
                 ),
                 marketplacePlugins = listOf(
-                    "org.toml.lang:243.19420.27",
-                    "PythonCore:243.19420.21",
-                    "Docker:243.19420.27"
+                    "org.toml.lang:243.21565.34",
+                    "PythonCore:243.21565.23",
+                    "Docker:243.21565.48"
                 )
             ),
             ultimate = ProductProfile(
-                sdkVersion = "243.19420-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "243.21565-EAP-CANDIDATE-SNAPSHOT",
                 bundledPlugins = commonPlugins + listOf(
                     "JavaScript",
                     "JavaScriptDebugger",
                     "com.intellij.database",
                     "com.jetbrains.codeWithMe",
                 ),
                 marketplacePlugins = listOf(
-                    "org.toml.lang:243.18137.23",
-                    "Pythonid:243.19420.21",
-                    "org.jetbrains.plugins.go:243.19420.21",
+                    "org.toml.lang:243.21565.34",
+                    "Pythonid:243.21565.23",
+                    "org.jetbrains.plugins.go:243.21565.23",
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2024.3-SNAPSHOT",
+                sdkVersion = "2024.3-RC1-SNAPSHOT",
                 bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2024.3.0",
-                nugetVersion = " 2024.3.0-eap03"
+                nugetVersion = " 2024.3.0-rc01"
             )
         ),
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ detekt = "1.23.7"
 diff-util = "4.12"
 intellijExt = "1.1.8"
 # match with <root>/settings.gradle.kts
-intellijGradle = "2.1.0"
+intellijGradle = "2.2.0-SNAPSHOT"
 intellijRemoteRobot = "0.11.22"
 jackson = "2.17.2"
 jacoco = "0.8.12"
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/OpenChatInputAction.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/OpenChatInputAction.kt
@@ -3,13 +3,17 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.inline
 
+import com.intellij.execution.impl.ConsoleViewImpl
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 
 class OpenChatInputAction : AnAction() {
     override fun actionPerformed(e: AnActionEvent) {
-        val editor = e.getRequiredData(CommonDataKeys.EDITOR)
+        val editor = e.getData(CommonDataKeys.EDITOR) ?: return
+        val isConsole = editor.document.getUserData(ConsoleViewImpl.IS_CONSOLE_DOCUMENT)
+        if (isConsole == true) return
+        if (!editor.document.isWritable) return
         val project = editor.project ?: return
 
         val inlineChatController = InlineChatController.getInstance(project)
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextProvider.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextProvider.kt
@@ -36,6 +36,7 @@ import java.net.HttpURLConnection
 import java.net.URL
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
+import kotlin.time.Duration.Companion.minutes
 
 class ProjectContextProvider(val project: Project, private val encoderServer: EncoderServer, private val cs: CoroutineScope) : Disposable {
     private val retryCount = AtomicInteger(0)
@@ -216,9 +217,9 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
         )
     }
 
-    private fun setConnectionTimeout(connection: HttpURLConnection) {
-        connection.connectTimeout = 5000 // 5 seconds
-        connection.readTimeout = 5000 // 5 second
+    private fun setConnectionTimeout(connection: HttpURLConnection, timeout: Int) {
+        connection.connectTimeout = timeout
+        connection.readTimeout = timeout
     }
 
     private fun setConnectionProperties(connection: HttpURLConnection) {
@@ -309,10 +310,11 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
     private fun sendMsgToLsp(msgType: LspMessage, request: String?): LspResponse {
         logger.info { "sending message: ${msgType.endpoint} to lsp on port ${encoderServer.port}" }
         val url = URL("http://localhost:${encoderServer.port}/${msgType.endpoint}")
-
+        // use 1h as timeout for index, 5 seconds for other APIs
+        val timeoutMs = if (msgType is LspMessage.Index) 60.minutes.inWholeMilliseconds.toInt() else 5000
         return with(url.openConnection() as HttpURLConnection) {
             setConnectionProperties(this)
-            setConnectionTimeout(this)
+            setConnectionTimeout(this, timeoutMs)
             request?.let { r ->
                 setConnectionRequest(this, r)
             }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fix a bug when Amazon Q responds with still indexing message even when `@workspace` index is done"
 +}