Merge pull request #49 from veezean/branch_dev_v422

v422改动说明
veezean · Jan 5, 2025 · cd25aa9 · cd25aa9
2 parents 24d28fb + c346304
commit cd25aa9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/IntellijIDEA-CodeReview-Plugin.zip → IntellijIDEA-CodeReview-Plugin-v422.zip b/IntellijIDEA-CodeReview-Plugin.zip → IntellijIDEA-CodeReview-Plugin-v422.zip
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>com.veezean.idea.plugin.codereviewer</id>
   <name>Code Review Helper</name>
-  <version>4.2.1</version>
+  <version>4.2.2</version>
   <vendor email="veezean@hotmail.com" url="https://github.com/veezean/IntellijIDEA-CodeReview-Plugin">Veezean</vendor>
 
   <description><![CDATA[
@@ -23,6 +23,7 @@
   <change-notes><![CDATA[
 
       English:<br>
+      2025-01-05: V4.2.2 support idea v2024.3+ <br>
       2024-08-08: V4.2.1 support line marker and original content snapshot, and several new functions <br>
       2024-05-19: V4.1.3 support right menu operates, change button to icons, and several new functions <br>
       2024-04-30: V4.1.2 v2024 idea incompatible bug fix<br>
@@ -46,6 +47,7 @@
       2019-10-04: V1.0 First version, provide base functions like add comment, import and export, etc.<br>
       <br>
       中文：<br>
+      2025-01-05: V4.2.2 支持v2024.3+以上版本的新IDEA中使用 <br>
       2024-08-08: V4.2.1 支持划线标记以及内容快照，以及部分新增功能<br>
       2024-05-19: V4.1.3 提供了右键菜单支持，可以右键添加评审意见，以及右键对评审意见进行操作；界面按钮改为icon图标，增加界面布局美观度；众多小功能点支持<br>
       2024-04-30: V4.1.2 v2024 idea版本不兼容问题修复<br>
@@ -118,6 +120,7 @@
   </projectListeners>
 
   <depends>com.intellij.modules.java</depends>
+  <depends>com.intellij.modules.json</depends>
   <depends>Git4Idea</depends>
 
 </idea-plugin>
diff --git a/src/com/veezean/idea/plugin/codereviewer/model/ReviewComment.java b/src/com/veezean/idea/plugin/codereviewer/model/ReviewComment.java
@@ -56,7 +56,7 @@ public ValuePair getPairPropValue(String propName) {
     }
 
     public void setStringPropValue(String name, String propValue) {
-        propValues.put(name, ValuePair.buildPair(propValue));
+        propValues.put(name, ValuePair.buildRawPair(propValue));
     }
 
     public void setPairPropValue(String name, ValuePair propValue) {

diff --git a/src/com/veezean/idea/plugin/codereviewer/model/ValuePair.java b/src/com/veezean/idea/plugin/codereviewer/model/ValuePair.java
@@ -58,7 +58,14 @@ public String getStringValue() {
         return this.value + "|" + this.showName;
     }
 
-    public static ValuePair buildPair(String stringValue) {
+    /**
+     * 根据传入的字符串进行构建pair对象，传入的字符串可能是有分隔符|的字段
+     * 注意：该方法适用于那种k-v的场景，对于可能随便填写字符串的场景(比如comment或者是content)，不要调用此字段
+     *
+     * @param stringValue
+     * @return
+     */
+    public static ValuePair buildPairSupportSplit(String stringValue) {
         ValuePair valuePair = new ValuePair();
         if (StringUtils.isEmpty(stringValue)) {
             return valuePair;

diff --git a/src/com/veezean/idea/plugin/codereviewer/util/ExcelResultProcessor.java b/src/com/veezean/idea/plugin/codereviewer/util/ExcelResultProcessor.java
@@ -163,7 +163,7 @@ public static List<ReviewComment> importExcel(String path) throws Exception {
 
                     Column column = recordColumns.getColumnByCode(colCode).orElse(null);
                     if (column != null && InputTypeDefine.isComboBox(column.getInputType())) {
-                        ValuePair pair = ValuePair.buildPair(dataRowCell.getStringCellValue());
+                        ValuePair pair = ValuePair.buildPairSupportSplit(dataRowCell.getStringCellValue());
                         comment.setPairPropValue(colCode, pair);
                     } else {
                         comment.setStringPropValue(colCode, dataRowCell.getStringCellValue());