fix issue #3 Update for yard parser used in CIQ 2.1.5

Update plugin to version to 0.3.3

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+#### 0.3.3
+* Fix adding SDK 2.1.5 (issue #3)
+
 #### 0.3.2
 * Potential fix for issue #2 (running in simulator on mac)
 * Allow to set minimum target SDK version for module, used when compiling

gradle.properties

@@ -1,9 +1,9 @@
 name=monkey
-ideaVersion=2016.2.3
+ideaVersion=2016.2.5
 javaVersion=1.8
 downloadIdeaSources=true
 
-pluginVersion=0.3.2
+pluginVersion=0.3.3
 
 publishUsername=user
 publishPassword=password

src/main/resources/META-INF/plugin.xml

@@ -35,10 +35,9 @@
     ]]></description>
 
   <change-notes><![CDATA[
-    <p>0.3.2</p>
+    <p>0.3.3</p>
     <ul>
-      <li>Potential fix for issue #2 (running in simulator on mac)</li>
-      <li>Allow to set minimum target SDK version for module, used when compiling</li>
+      <li>Fix adding SDK 2.1.5 (issue #3)</li>
     </ul>
 
     <a href="https://github.com/liias/monkey/blob/master/CHANGELOG.md#changelog">Full change log...</a>

yard-decompiler/src/main/java/io/github/liias/monkey/yard/YardDecompiler.java

@@ -304,12 +304,33 @@ private void addMethod(SdkModuleOrClass moduleOrClass, Element methodEl) {
     String methodName = signatureEl.select("strong").text();
     SdkMethod sdkMethod = new SdkMethod(methodName);
 
-    String validParamsStr = signatureEl.ownText().substring(4).trim();
+    // pre 2.1.5:
+    // - (<tt>Object</tt>) <strong>switchToView</strong>(view, delegate, transition)
+    // "- () (view, delegate, transition)"
+    // "() (view, delegate, transition)"
+
+    // since 2.1.5:
+    // #<strong>switchToView</strong>(view, delegate, transition)  ⇒ <tt>Object</tt>
+    // "#(view, delegate, transition)  ⇒ "
+    // "(view, delegate, transition)"
+
+    String paramNames = signatureEl.ownText()
+      .replace("-", "")
+      .replace("#", "")
+      .replace("⇒", "")
+      .trim();
+
+    int iLeftP = paramNames.lastIndexOf("(");
+    int iRightP = paramNames.lastIndexOf(")");
     Set<String> validParamNames = new HashSet<>();
-    if (!validParamsStr.isEmpty()) {
-      String[] validParams = validParamsStr.substring(1, validParamsStr.length() - 1).split(",");
-      for (String validParam : validParams) {
-        validParamNames.add(validParam.trim());
+
+    if (iLeftP != -1 && iRightP != -1) {
+      String validParamsStr = paramNames.substring(iLeftP + 1, iRightP);
+      if (!validParamsStr.isEmpty()) {
+        String[] validParams = validParamsStr.split(",");
+        for (String validParam : validParams) {
+          validParamNames.add(validParam.trim());
+        }
       }
     }