Merge branch 'dev'

YiiGuxing · Jan 21, 2020 · 3f0d4d4 · 3f0d4d4
2 parents 93220e2 + d483808
commit 3f0d4d4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [v2.7.2](https://github.com/YiiGuxing/TranslationPlugin/tree/v2.7.2) (2020-01-21)
+
+- 修复了Dart语言中无法对类的第一个成员的文档注释进行文档翻译的问题
+
 ## [v2.7.1](https://github.com/YiiGuxing/TranslationPlugin/tree/v2.7.1) (2020-01-13)
 
 - 优化了单行文档注释的交互体验

diff --git a/README.md b/README.md
@@ -48,10 +48,10 @@ TranslationPlugin
 安装
 ----
 - **使用 IDE 内置插件系统安装:**
-  - <kbd>Preferences(Settings)</kbd> > <kbd>Plugins</kbd> > <kbd>Browse repositories...</kbd> > <kbd>搜索并找到"Translation"</kbd> > <kbd>Install Plugin</kbd>
+  - <kbd>Preferences(Settings)</kbd> > <kbd>Plugins</kbd> > <kbd>Marketplace</kbd> > <kbd>搜索并找到<b>"Translation"</b></kbd> > <kbd>Install</kbd>
 
 - **手动安装:**
-  - 下载[插件包][latest-release] -> <kbd>Preferences(Settings)</kbd> > <kbd>Plugins</kbd> > <kbd>Install plugin from disk...</kbd> -> 选择插件包并安装（无需解压）
+  - 下载[插件包][latest-release] -> <kbd>Preferences(Settings)</kbd> > <kbd>Plugins</kbd> > <kbd>⚙️</kbd> > <kbd>Install plugin from disk...</kbd> -> 选择插件包并安装（无需解压）
 
 重启**IDE**.
 
@@ -178,10 +178,9 @@ FAQ
 更新日志
 --------
 
-## [v2.7.1](https://github.com/YiiGuxing/TranslationPlugin/tree/v2.7.1) (2020-01-13)
+## [v2.7.2](https://github.com/YiiGuxing/TranslationPlugin/tree/v2.7.2) (2020-01-21)
 
-- 优化了单行文档注释的交互体验
-- 修复了Go语言在一些情况下无法进行文档翻译的问题
+- 修复了Dart语言中无法对类的第一个成员的文档注释进行文档翻译的问题
 
 [完整的更新历史记录](./CHANGELOG.md)
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # suppress inspection "UnusedProperty" for whole file
-version=2.7.1
+version=2.7.2
 buildNumber=
 ideaVersion=IU-2017.1
 javaVersion=1.8

diff --git a/src/main/kotlin/cn/yiiguxing/plugin/translate/provider/DartDocumentationElementProvider.kt b/src/main/kotlin/cn/yiiguxing/plugin/translate/provider/DartDocumentationElementProvider.kt
@@ -8,8 +8,8 @@ import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiWhiteSpace
 import com.jetbrains.lang.dart.DartTokenTypesSets
+import com.jetbrains.lang.dart.psi.DartClassMembers
 import com.jetbrains.lang.dart.psi.DartComponent
-import com.jetbrains.lang.dart.psi.DartComponentName
 import com.jetbrains.lang.dart.psi.DartDocComment
 import com.jetbrains.lang.dart.psi.DartVarDeclarationList
 
@@ -33,6 +33,7 @@ class DartDocumentationElementProvider : AbstractDocumentationElementProvider<Ps
 
             return when (val sibling = getNextSiblingSkippingCondition(SKIPPING_CONDITION)) {
                 is DartComponent -> sibling.componentName
+                is DartClassMembers,
                 is DartVarDeclarationList -> sibling.findChildOfType(DartComponent::class.java)?.componentName
                 else -> null
             }
@@ -43,8 +44,6 @@ class DartDocumentationElementProvider : AbstractDocumentationElementProvider<Ps
             it is PsiWhiteSpace || (it is PsiComment && it !is DartDocComment)
         }
 
-        private val DART_COMPONENT_NAME_CONDITION: (PsiElement) -> Boolean = { it is DartComponentName }
-
         /**
          * 向上检查是否存在多行文档注释
          */

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -43,8 +43,7 @@
 
     <change-notes><![CDATA[
       <ul>
-        <li>优化了单行文档注释的交互体验</li>
-        <li>修复了Go语言在一些情况下无法进行文档翻译的问题</li>
+        <li>修复了Dart语言中无法对类的第一个成员的文档注释进行文档翻译的问题</li>
       </ul>
       <a href="https://github.com/YiiGuxing/TranslationPlugin/blob/master/CHANGELOG.md"><b>Full Changelog History</b></a>
     ]]></change-notes>