add plugin-util module to project, revert expansion of _SRCS/_HDRS name

Author: vsch

.idea/artifacts/plugin_util_cas_jar.xml

@@ -10,15 +10,15 @@
       <sourceFolder url="file://$MODULE_DIR$/test-resources" type="java-test-resource" />
     </content>
     <orderEntry type="library" name="com.vladsch.flexmark:flexmark:0.64.0" level="project" />
-    <orderEntry type="library" name="plugin-util" level="project" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="library" scope="PROVIDED" name="clion" level="project" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="jssc" level="project" />
     <orderEntry type="library" name="commons-io-2.4" level="project" />
     <orderEntry type="library" name="Kotlin" level="project" />
     <orderEntry type="library" name="com.vladsch.flexmark:flexmark-test-util:0.64.0" level="project" />
-    <orderEntry type="library" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" name="junit-4.13.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="hamcrest-core-1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="junit-4.13.2" level="project" />
+    <orderEntry type="module" module-name="plugin-util-cas" />
   </component>
 </module>

.idea/libraries/plugin_util.xml

@@ -5,7 +5,8 @@
 ### Version History
 - [CLionArduinoPlugin Version Notes](#clionarduinoplugin-version-notes)
   - [TO DO](#to-do)
-  - [1.5.26 Next](#1526-next)
+  - [1.5.30 Next](#1530-next)
+  - [1.5.25 Next](#1525-next)
   - [1.5.11](#1511)
   - [1.5.9](#159)
   - [1.5.7](#157)
@@ -52,7 +53,12 @@
   * Add: inspection to check that `CMakeLists.txt` is out of sync, especially if missing the
     toolchain file.
 
-### 1.5.26 Next
+### 1.5.30 Next
+
+* Fix: revert macro name for `_SRCS` and `_HRDS` to be resoved but the arguments to remain
+  unresolved.
+
+### 1.5.25 Next
 
 * Fix: resolve white space preservation in regenerated `CMakeLists.txt` file. Only changing text
   for values which were changed.

.idea/libraries/vladsch_flexmark_tree_iteration.xml

@@ -4,7 +4,7 @@
     <name>Arduino Support</name>
     <vendor email="vladimir.schneider@gmail.com" url="https://github.com/vsch">Vladimir Schneider</vendor>
 
-    <version>1.5.25</version>
+    <version>1.5.29</version>
     <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->
     <depends>com.intellij.modules.clion</depends>

.idea/libraries/vladsch_flexmark_util.xml

@@ -313,8 +313,8 @@ class ArduinoCMakeListsTxtBuilder : CMakeListsTxtBuilder {
             val cMakeProjectName = builder.cMakeProjectName
 
             settings.projectName = cMakeProjectName ?: ""
-            settings.sources = cMakeVariableValues["${builder.cMakeProjectNameMacro}_SRCS"].toTypedArray()
-            settings.headers = cMakeVariableValues["${builder.cMakeProjectNameMacro}_HDRS"].toTypedArray()
+            settings.sources = cMakeVariableValues["${cMakeProjectName}_SRCS"].toTypedArray()
+            settings.headers = cMakeVariableValues["${cMakeProjectName}_HDRS"].toTypedArray()
             settings.sketch = cMakeVariableValues["${cMakeProjectName}_SKETCH"].firstOrNull() ?: ""
             settings.boardId = cMakeVariableValues["${cMakeProjectName}_BOARD"].firstOrNull() ?: ""
             settings.cpuId = cMakeVariableValues["ARDUINO_CPU"].firstOrNull() ?: ""