Implement parsing for escaped strings

smalidea/src/main/java/org/jf/smalidea/dexlib/SmalideaMethodParameter.java

@@ -36,6 +36,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jf.dexlib2.base.BaseMethodParameter;
 import org.jf.dexlib2.iface.Annotation;
 import org.jf.smalidea.psi.impl.SmaliMethodParameter;
+import org.jf.smalidea.util.StringUtils;
 
 import javax.annotation.Nonnull;
 import java.util.Set;
@@ -53,7 +54,7 @@ public class SmalideaMethodParameter extends BaseMethodParameter {
     }
 
     @Nullable @Override public String getName() {
-        return psiParameter.getName();
+        return StringUtils.parseQuotedString(psiParameter.getName());
     }
 
     @Nonnull @Override public String getType() {

smalidea/src/main/java/org/jf/smalidea/dexlib/instruction/SmalideaInstruction.java

@@ -46,6 +46,7 @@ import org.jf.dexlib2.immutable.reference.ImmutableTypeReference;
 import org.jf.smalidea.psi.SmaliElementTypes;
 import org.jf.smalidea.psi.impl.*;
 import org.jf.smalidea.util.NameUtils;
+import org.jf.smalidea.util.StringUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -180,8 +181,8 @@ public abstract class SmalideaInstruction implements Instruction {
     @Nonnull public Reference getReference() {
         switch (getReferenceType()) {
             case ReferenceType.STRING:
-                // TODO: get the actual string value
-                return new ImmutableStringReference("");
+                return new ImmutableStringReference(StringUtils.parseQuotedString(
+                        psiInstruction.getLiteral().getText()));
             case ReferenceType.TYPE:
                 SmaliTypeElement typeReference = psiInstruction.getTypeReference();
                 assert typeReference != null;
@@ -207,7 +208,7 @@ public abstract class SmalideaInstruction implements Instruction {
             case ReferenceType.FIELD:
                 SmaliFieldReference fieldReference = psiInstruction.getFieldReference();
                 assert fieldReference != null;
-                containingClass = NameUtils.javaToSmaliType(fieldReference.getContainingClass().getQualifiedName());
+                containingClass = fieldReference.getContainingType().getText();
                 return new ImmutableFieldReference(containingClass,
                         fieldReference.getName(),
                         fieldReference.getFieldType().getText());

smalidea/src/main/java/org/jf/smalidea/util/StringUtils.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.smalidea.util;
+
+import org.antlr.runtime.CommonToken;
+import org.jetbrains.annotations.Nullable;
+import org.jf.smali.smaliFlexLexer;
+import org.jf.smali.smaliParser;
+
+import java.io.StringReader;
+
+public class StringUtils {
+
+    @Nullable
+    public static String parseQuotedString(String str) {
+        if (str.charAt(0) != '"') {
+            return null;
+        }
+
+        smaliFlexLexer lexer = new smaliFlexLexer(new StringReader(str));
+        lexer.setSuppressErrors(true);
+
+        CommonToken token = (CommonToken)lexer.nextToken();
+        if (token.getType() != smaliParser.STRING_LITERAL) {
+            return null;
+        }
+
+        if (token.getStopIndex() != str.length()-1) {
+            return null;
+        }
+
+        String text = token.getText();
+        return text.substring(1, text.length()-1);
+    }
+}

smalidea/src/test/java/org/jf/smalidea/util/StringUtilsTest.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.smalidea.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class StringUtilsTest {
+    @Test
+    public void testStringUtilsBasic() throws Exception {
+        String parsedString = StringUtils.parseQuotedString("\"abcd\"");
+        Assert.assertEquals("abcd", parsedString);
+    }
+
+    @Test
+    public void testStringUtilsQuotedChars() throws Exception {
+        String parsedString = StringUtils.parseQuotedString("\"a\\\\b\\nc\\uabcdd\"");
+        Assert.assertEquals("a\\b\nc\uabcdd", parsedString);
+    }
+}