Escape strings where needed. Use the separator as an argument

quarnster · quarnster · commit b6e0db7d58ea · 2012-05-10T17:34:11.000+02:00
separator too. Latest SublimeCompletionCommon. Should help with
issue #26
diff --git a/SublimeJava.class b/SublimeJava.class
diff --git a/SublimeJava.java b/SublimeJava.java
@@ -46,7 +46,7 @@ private static String getInstancedType(Class<?> c, String gen, String ret, Strin
                 Matcher m = p.matcher(gen);
                 if (m.find())
                 {
-                    gen = m.replaceAll(m.group(1) + templateParam[i] + m.group(3));
+                    gen = m.replaceAll(Matcher.quoteReplacement(m.group(1) + templateParam[i] + m.group(3)));
                 }
             }
             ret = gen;
@@ -76,7 +76,7 @@ private static String[] getCompletion(Method m, String filter, String[] template
             String ret = normal[i].getName();
             ret = getInstancedType(m.getDeclaringClass(), gen, ret, templateParam);
             str += ret;
-            ins += "${"+count + ":" + ret + "}";
+            ins += "${"+count + ":" + ret.replace("$", "\\$") + "}";
             count++;
         }
         str += ")\t" + getInstancedType(m.getDeclaringClass(), m.getGenericReturnType().toString(), m.getReturnType().getName(), templateParam);
@@ -201,7 +201,7 @@ public static void main(String... unusedargs)
                     String cmd = in.readLine();
                     if (cmd == null)
                         break;
-                    String args[] = cmd.split(" ");
+                    String args[] = cmd.split(";;--;;");
                     System.err.println(args.length);
                     for (int i = 0; i < args.length; i++)
                     {
diff --git a/sublimecompletioncommon b/sublimecompletioncommon
@@ -1 +1 @@
-Subproject commit 4741e545bf8a2068064b48f800b8d74f4c4c6ec4
+Subproject commit 35f8a3f8eca38edf665022c5ce65cf2bfc3eb62b

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ private static String getInstancedType(Class<?> c, String gen, String ret, Strin`
`46`	`46`	`Matcher m = p.matcher(gen);`
`47`	`47`	`if (m.find())`
`48`	`48`	`{`
`49`		`- gen = m.replaceAll(m.group(1) + templateParam[i] + m.group(3));`
	`49`	`+ gen = m.replaceAll(Matcher.quoteReplacement(m.group(1) + templateParam[i] + m.group(3)));`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`ret = gen;`
`@@ -76,7 +76,7 @@ private static String[] getCompletion(Method m, String filter, String[] template`
`76`	`76`	`String ret = normal[i].getName();`
`77`	`77`	`ret = getInstancedType(m.getDeclaringClass(), gen, ret, templateParam);`
`78`	`78`	`str += ret;`
`79`		`- ins += "${"+count + ":" + ret + "}";`
	`79`	`+ ins += "${"+count + ":" + ret.replace("$", "\\$") + "}";`
`80`	`80`	`count++;`
`81`	`81`	`}`
`82`	`82`	`str += ")\t" + getInstancedType(m.getDeclaringClass(), m.getGenericReturnType().toString(), m.getReturnType().getName(), templateParam);`
`@@ -201,7 +201,7 @@ public static void main(String... unusedargs)`
`201`	`201`	`String cmd = in.readLine();`
`202`	`202`	`if (cmd == null)`
`203`	`203`	`break;`
`204`		`- String args[] = cmd.split(" ");`
	`204`	`+ String args[] = cmd.split(";;--;;");`
`205`	`205`	`System.err.println(args.length);`
`206`	`206`	`for (int i = 0; i < args.length; i++)`
`207`	`207`	`{`