ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-29 04:10:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add a deserializeNullableString utility method to the base stub class

Browse Source
This commit is contained in:
Ben Gruver 2015-02-16 13:03:08 -08:00
parent 9423a7d7d0
commit eb1d98f063
6 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java
View File

@ -36,7 +36,6 @@ import com.intellij.psi.stubs.IndexSink;
import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubInputStream;
import com.intellij.psi.stubs.StubOutputStream; import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jf.smalidea.psi.impl.SmaliClass; import org.jf.smalidea.psi.impl.SmaliClass;
import org.jf.smalidea.psi.index.SmaliClassNameIndex; import org.jf.smalidea.psi.index.SmaliClassNameIndex;
@ -74,12 +73,7 @@ public class SmaliClassElementType extends SmaliStubElementType<SmaliClassStub,
@NotNull @Override @NotNull @Override
public SmaliClassStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException { public SmaliClassStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
StringRef nameRef = dataStream.readName(); return new SmaliClassStub(parentStub, deserializeNullableString(dataStream));
String name = null;
if (nameRef != null) {
name = nameRef.getString();
}
return new SmaliClassStub(parentStub, name);
} }
@Override public void indexStub(@NotNull SmaliClassStub stub, @NotNull IndexSink sink) { @Override public void indexStub(@NotNull SmaliClassStub stub, @NotNull IndexSink sink) {

10
smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliFieldElementType.java
View File

@ -36,7 +36,6 @@ import com.intellij.psi.stubs.IndexSink;
import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubInputStream;
import com.intellij.psi.stubs.StubOutputStream; import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jf.smalidea.psi.impl.SmaliField; import org.jf.smalidea.psi.impl.SmaliField;
import org.jf.smalidea.psi.stub.SmaliFieldStub; import org.jf.smalidea.psi.stub.SmaliFieldStub;
@ -74,13 +73,8 @@ public class SmaliFieldElementType extends SmaliStubElementType<SmaliFieldStub,
@NotNull @Override @NotNull @Override
public SmaliFieldStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException { public SmaliFieldStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
StringRef nameRef = dataStream.readName(); return new SmaliFieldStub(parentStub, deserializeNullableString(dataStream),
String name = null; dataStream.readName().getString());
if (nameRef != null) {
name = nameRef.getString();
}
return new SmaliFieldStub(parentStub, name, dataStream.readName().getString());
} }
@Override public void indexStub(@NotNull SmaliFieldStub stub, @NotNull IndexSink sink) { @Override public void indexStub(@NotNull SmaliFieldStub stub, @NotNull IndexSink sink) {

4
smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodElementType.java
View File

@ -36,7 +36,6 @@ import com.intellij.psi.stubs.IndexSink;
import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubInputStream;
import com.intellij.psi.stubs.StubOutputStream; import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jf.smalidea.psi.impl.SmaliMethod; import org.jf.smalidea.psi.impl.SmaliMethod;
import org.jf.smalidea.psi.stub.SmaliMethodStub; import org.jf.smalidea.psi.stub.SmaliMethodStub;
@ -73,8 +72,7 @@ public class SmaliMethodElementType extends SmaliStubElementType<SmaliMethodStub
@NotNull @Override @NotNull @Override
public SmaliMethodStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException { public SmaliMethodStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
StringRef methodNameRef = dataStream.readName(); return new SmaliMethodStub(parentStub, dataStream.readName().getString());
return new SmaliMethodStub(parentStub, methodNameRef.getString());
} }
@Override public void indexStub(@NotNull SmaliMethodStub stub, @NotNull IndexSink sink) { @Override public void indexStub(@NotNull SmaliMethodStub stub, @NotNull IndexSink sink) {

8
smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodParameterElementType.java
View File

@ -36,7 +36,6 @@ import com.intellij.psi.stubs.IndexSink;
import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubInputStream;
import com.intellij.psi.stubs.StubOutputStream; import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jf.smalidea.psi.impl.SmaliMethodParameter; import org.jf.smalidea.psi.impl.SmaliMethodParameter;
import org.jf.smalidea.psi.stub.SmaliMethodParameterStub; import org.jf.smalidea.psi.stub.SmaliMethodParameterStub;
@ -77,11 +76,8 @@ public class SmaliMethodParameterElementType
@NotNull @Override @NotNull @Override
public SmaliMethodParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) public SmaliMethodParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub)
throws IOException { throws IOException {
String type = dataStream.readName().getString(); return new SmaliMethodParameterStub(parentStub, dataStream.readName().getString(),
StringRef nameRef = dataStream.readName(); deserializeNullableString(dataStream));
String name = nameRef==null ? null : nameRef.getString();
return new SmaliMethodParameterStub(parentStub, type, name);
} }
@Override public void indexStub(@NotNull SmaliMethodParameterStub stub, @NotNull IndexSink sink) { @Override public void indexStub(@NotNull SmaliMethodParameterStub stub, @NotNull IndexSink sink) {

8
smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliMethodPrototypeElementType.java
View File

@ -37,7 +37,6 @@ import com.intellij.psi.stubs.IndexSink;
import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubInputStream;
import com.intellij.psi.stubs.StubOutputStream; import com.intellij.psi.stubs.StubOutputStream;
import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jf.smalidea.psi.impl.SmaliMethodPrototype; import org.jf.smalidea.psi.impl.SmaliMethodPrototype;
import org.jf.smalidea.psi.stub.SmaliMethodPrototypeStub; import org.jf.smalidea.psi.stub.SmaliMethodPrototypeStub;
@ -83,12 +82,7 @@ public class SmaliMethodPrototypeElementType
@NotNull @Override @NotNull @Override
public SmaliMethodPrototypeStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) public SmaliMethodPrototypeStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub)
throws IOException { throws IOException {
StringRef returnTypeRef = dataStream.readName(); return new SmaliMethodPrototypeStub(parentStub, deserializeNullableString(dataStream));
String returnType = null;
if (returnTypeRef != null) {
returnType = returnTypeRef.getString();
}
return new SmaliMethodPrototypeStub(parentStub, returnType);
} }
@Override public void indexStub(@NotNull SmaliMethodPrototypeStub stub, @NotNull IndexSink sink) { @Override public void indexStub(@NotNull SmaliMethodPrototypeStub stub, @NotNull IndexSink sink) {

14
smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliStubElementType.java
View File

@ -35,10 +35,15 @@ import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.IStubElementType;
import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.stubs.StubInputStream;
import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jf.smalidea.SmaliLanguage; import org.jf.smalidea.SmaliLanguage;
import java.io.IOException;
public abstract class SmaliStubElementType<StubT extends StubElement, PsiT extends PsiElement> public abstract class SmaliStubElementType<StubT extends StubElement, PsiT extends PsiElement>
extends IStubElementType<StubT, PsiT> { extends IStubElementType<StubT, PsiT> {
protected SmaliStubElementType(@NotNull @NonNls String debugName) { protected SmaliStubElementType(@NotNull @NonNls String debugName) {
@ -46,4 +51,13 @@ public abstract class SmaliStubElementType<StubT extends StubElement, PsiT exten
} }
public abstract PsiT createPsi(@NotNull ASTNode node); public abstract PsiT createPsi(@NotNull ASTNode node);
@Nullable
protected String deserializeNullableString(@NotNull StubInputStream dataStream) throws IOException {
StringRef stringRef = dataStream.readName();
if (stringRef == null) {
return null;
}
return stringRef.getString();
}
} }