Released 3.3

wuyr · Jul 22, 2020 · cd4ea40 · cd4ea40
1 parent 4e02517
commit cd4ea40
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 7 deletions.
diff --git a/GoogleLibraryVersionQuerier.zip b/GoogleLibraryVersionQuerier.zip
diff --git a/README.md b/README.md
@@ -60,6 +60,8 @@
 
 ### 更新日志:
 
+ - **3.3** 修复兼容性问题，现最低兼容到AndroidStudio3.0；优化体验：右键菜单选项『Query available versions』只在编辑.gradle文件时显示；『Query available versions』的快捷键改为『CTRL ALT Q』，因原来的『ALT Q』与其他快捷键有冲突；
+
  - **3.2** 优化查询，彻底修复编辑gradle文件卡顿的问题；查询可用版本改为倒序排序；加入监听ESC键关闭版本选择对话框。
 
  - **3.1** 修复键入任何字符和在任何文件下也会弹提示的Bug，加入限制:只有在.gradle文件中的dependencies作用域内才会搜索仓库。

diff --git a/out/production/GoogleLibraryVersionQuerier/META-INF/plugin.xml b/out/production/GoogleLibraryVersionQuerier/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.wuyr.google_library_query</id>
     <name>Google Library Version Querier</name>
-    <version>3.2</version>
+    <version>3.3</version>
     <vendor email="ifxcyr@gmail.com" url="https://github.com/wuyr">陈小缘</vendor>
 
     <description><![CDATA[
@@ -13,6 +13,8 @@
     ]]></description>
 
     <change-notes><![CDATA[
+      <p><li><strong>3.3 </strong>Compatibility issues fixes.</li></p>
+
       <p><li><strong>3.2 </strong>Bug fixes.</li></p>
 
       <p><li><strong>3.1 </strong>Bug fixes.</li></p>
@@ -27,7 +29,7 @@
       <br>
     ]]></change-notes>
 
-    <idea-version since-build="173.0"/>
+    <idea-version since-build="171.0"/>
 
     <depends>com.intellij.modules.lang</depends>
 
@@ -40,7 +42,7 @@
         <action id="com.wuyr.google_library_query.QueryAction" class="com.wuyr.google_library_query.QueryAction"
                 text="Query Available Versions" description="Query available versions">
             <add-to-group group-id="XmlGenerateToolsGroup"/>
-            <keyboard-shortcut keymap="$default" first-keystroke="alt Q"/>
+            <keyboard-shortcut keymap="$default" first-keystroke="control alt Q"/>
         </action>
     </actions>
 

diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.wuyr.google_library_query</id>
     <name>Google Library Version Querier</name>
-    <version>3.2</version>
+    <version>3.3</version>
     <vendor email="ifxcyr@gmail.com" url="https://github.com/wuyr">陈小缘</vendor>
 
     <description><![CDATA[
@@ -13,6 +13,8 @@
     ]]></description>
 
     <change-notes><![CDATA[
+      <p><li><strong>3.3 </strong>Compatibility issues fixes.</li></p>
+
       <p><li><strong>3.2 </strong>Bug fixes.</li></p>
 
       <p><li><strong>3.1 </strong>Bug fixes.</li></p>
@@ -27,7 +29,7 @@
       <br>
     ]]></change-notes>
 
-    <idea-version since-build="173.0"/>
+    <idea-version since-build="171.0"/>
 
     <depends>com.intellij.modules.lang</depends>
 
@@ -40,7 +42,7 @@
         <action id="com.wuyr.google_library_query.QueryAction" class="com.wuyr.google_library_query.QueryAction"
                 text="Query Available Versions" description="Query available versions">
             <add-to-group group-id="XmlGenerateToolsGroup"/>
-            <keyboard-shortcut keymap="$default" first-keystroke="alt Q"/>
+            <keyboard-shortcut keymap="$default" first-keystroke="control alt Q"/>
         </action>
     </actions>
 

diff --git a/src/com/wuyr/google_library_query/GradleContributor.kt b/src/com/wuyr/google_library_query/GradleContributor.kt
@@ -132,5 +132,5 @@ class GradleContributor : CompletionContributor() {
                 WriteCommandAction.runWriteCommandAction(context.project) {
                     context.document.replaceString(lineStartPosition + additionalIndex, lineEndPosition - 1, item.lookupString)
                 }
-            }.withTypeIconRightAligned(true)
+            }
 }
diff --git a/src/com/wuyr/google_library_query/NetworkRequstter.kt b/src/com/wuyr/google_library_query/NetworkRequstter.kt
@@ -3,6 +3,8 @@
 package com.wuyr.google_library_query
 
 import com.google.gson.Gson
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
 import java.net.SocketTimeoutException
 import java.net.URL
 import java.net.URLDecoder
@@ -153,6 +155,12 @@ fun String.getAPIResponse(retryCount: Int): String? {
     exception?.let { throw  exception } ?: return null
 }
 
+private fun InputStream.readBytes(): ByteArray {
+    val buffer = ByteArrayOutputStream(maxOf(DEFAULT_BUFFER_SIZE, this.available()))
+    copyTo(buffer)
+    return buffer.toByteArray()
+}
+
 inline fun <T, R> T.runSafely(block: (T) -> R) = try {
     block(this)
 } catch (e: Exception) {

diff --git a/src/com/wuyr/google_library_query/QueryAction.kt b/src/com/wuyr/google_library_query/QueryAction.kt
@@ -68,6 +68,18 @@ class QueryAction : AnAction() {
         v2.length - v1.length
     }
 
+    private val acceptFilesType = arrayOf(".gradle")
+
+    override fun update(event: AnActionEvent) {
+        acceptFilesType.any { event.getData(CommonDataKeys.PSI_FILE)?.name?.endsWith(it) ?: false }.let { enable ->
+            event.presentation.run {
+                isEnabled = enable
+                isVisible = enable
+            }
+        }
+        super.update(event)
+    }
+
     override fun actionPerformed(event: AnActionEvent) {
         thread {
             event.getData(CommonDataKeys.EDITOR)?.let { editor ->