PlantUml library upgrade to 8033

esteinberg · Nov 20, 2015 · 0438bc0 · 0438bc0
1 parent 7e27c8f
commit 0438bc0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <idea-plugin version="2">
     <name>PlantUML integration</name>
-    <version>1.8.1</version>
+    <version>1.9.0-SNAPSHOT</version>
     <vendor>Eugene Steinberg</vendor>
     <!-- IJ 12+ -->
     <idea-version since-build="129.000"/>
@@ -9,6 +9,10 @@
 
     <change-notes>
         <![CDATA[
+            <p>1.9.0</p>
+            <ul>
+               <li>PlantUml library upgrade to 8033</li>
+            </ul>
             <p>1.8.1</p>
             <ul>
                 <li>PlantUml library upgrade to 8027</li>
@@ -22,16 +26,6 @@
                 <li>Reverse Arrow intention (only for PlantUML file types) - place caret on an arrow; Alt+Enter...</li>
                 <li>Enabled block and line comment actions (only for PlantUML file types)</li>
             </ul>
-            <p>1.7.1</p>
-            <ul>
-                <li>PlantUml library upgrade to 8025</li>
-            </ul>
-            <p>1.7.0</p>
-            <ul>
-                <li>included file is automatically saved before rendering</li>
-                <li>syntax validation fix for !include (no syntax validation after !include is possible for now)</li>
-                <li>PlantUml library upgrade to 8021</li>
-            </ul>
        ]]>
     </change-notes>
     <depends>com.intellij.modules.platform</depends>

diff --git a/lib/plantuml.jar b/lib/plantuml.jar
diff --git a/src/org/plantuml/idea/plantuml/PlantUmlIncludes.java b/src/org/plantuml/idea/plantuml/PlantUmlIncludes.java
@@ -8,6 +8,7 @@
 import com.intellij.util.ui.UIUtil;
 import net.sourceforge.plantuml.BlockUmlBuilder;
 import net.sourceforge.plantuml.preproc.Defines;
+import net.sourceforge.plantuml.preproc.FileWithSuffix;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -28,7 +29,7 @@ public static Set<File> commitIncludes(String source, @Nullable File baseDir) {
         try {
             if (baseDir != null) {
                 BlockUmlBuilder blockUmlBuilder = new BlockUmlBuilder(Collections.<String>emptyList(), UTF8, new Defines(), new StringReader(source), baseDir, null);
-                final Set<File> includedFiles = blockUmlBuilder.getIncludedFiles();
+                Set<File> includedFiles = FileWithSuffix.convert(blockUmlBuilder.getIncludedFiles());
                 if (!includedFiles.isEmpty()) {
                     saveModifiedFiles(includedFiles);
                 }