From c9c5cd9d5ba37fa378dc61811303d69ffc3d473b Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sun, 16 Mar 2014 13:39:23 -0700 Subject: [PATCH] Implement initial SmaliClass --- .../java/org/jf/smalidea/SmaliParser.java | 3 + .../jf/smalidea/SmaliParserDefinition.java | 9 ++- .../jf/smalidea/psi/SmaliElementTypes.java | 2 + .../org/jf/smalidea/psi/impl/SmaliClass.java | 47 +++++++++++ .../psi/impl/SmaliStubBasedPsiElement.java | 50 ++++++++++++ .../jf/smalidea/psi/stub/SmaliClassStub.java | 43 ++++++++++ .../psi/stub/SmaliStubElementType.java | 49 ++++++++++++ .../stub/element/SmaliClassElementType.java | 80 +++++++++++++++++++ 8 files changed, 281 insertions(+), 2 deletions(-) create mode 100644 smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java create mode 100644 smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliStubBasedPsiElement.java create mode 100644 smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliClassStub.java create mode 100644 smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliStubElementType.java create mode 100644 smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java diff --git a/smalidea/src/main/java/org/jf/smalidea/SmaliParser.java b/smalidea/src/main/java/org/jf/smalidea/SmaliParser.java index 819d11eb..ed0fb19a 100644 --- a/smalidea/src/main/java/org/jf/smalidea/SmaliParser.java +++ b/smalidea/src/main/java/org/jf/smalidea/SmaliParser.java @@ -38,12 +38,14 @@ import com.intellij.lang.PsiParser; import com.intellij.psi.tree.IElementType; import org.antlr.runtime.RecognitionException; import org.jetbrains.annotations.NotNull; +import org.jf.smalidea.psi.SmaliElementTypes; public class SmaliParser implements PsiParser { @NotNull @Override public ASTNode parse(IElementType root, PsiBuilder builder) { builder.setDebugMode(true); PsiBuilder.Marker rootMarker = builder.mark(); + PsiBuilder.Marker classMarker = builder.mark(); PsiBuilderTokenStream tokenStream = new PsiBuilderTokenStream(builder); smalideaParser parser = new smalideaParser(tokenStream); @@ -55,6 +57,7 @@ public class SmaliParser implements PsiParser { ex.printStackTrace(); } + classMarker.done(SmaliElementTypes.CLASS); rootMarker.done(root); return builder.getTreeBuilt(); } diff --git a/smalidea/src/main/java/org/jf/smalidea/SmaliParserDefinition.java b/smalidea/src/main/java/org/jf/smalidea/SmaliParserDefinition.java index d21445ee..fb828ca8 100644 --- a/smalidea/src/main/java/org/jf/smalidea/SmaliParserDefinition.java +++ b/smalidea/src/main/java/org/jf/smalidea/SmaliParserDefinition.java @@ -31,7 +31,6 @@ package org.jf.smalidea; -import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.lang.LanguageUtil; import com.intellij.lang.ParserDefinition; @@ -42,11 +41,13 @@ import com.intellij.psi.FileViewProvider; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.TokenType; +import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; import org.jf.smalidea.psi.SmaliElementTypes; import org.jf.smalidea.psi.impl.SmaliFile; +import org.jf.smalidea.psi.stub.SmaliStubElementType; public class SmaliParserDefinition implements ParserDefinition { @NotNull @Override public Lexer createLexer(Project project) { @@ -77,7 +78,11 @@ public class SmaliParserDefinition implements ParserDefinition { } @NotNull @Override public PsiElement createElement(ASTNode node) { - return new ASTWrapperPsiElement(node); + IElementType elementType = node.getElementType(); + if (elementType instanceof SmaliStubElementType) { + return ((SmaliStubElementType)elementType).createPsi(node); + } + throw new RuntimeException("Unexpected element type"); } @Override public PsiFile createFile(FileViewProvider viewProvider) { diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java b/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java index c6408e4b..b9eea561 100644 --- a/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java +++ b/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java @@ -31,8 +31,10 @@ package org.jf.smalidea.psi; +import org.jf.smalidea.psi.stub.element.SmaliClassElementType; import org.jf.smalidea.psi.stub.element.SmaliFileElementType; public class SmaliElementTypes { public static final SmaliFileElementType FILE = SmaliFileElementType.INSTANCE; + public static final SmaliClassElementType CLASS = SmaliClassElementType.INSTANCE; } diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java new file mode 100644 index 00000000..7caa655e --- /dev/null +++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java @@ -0,0 +1,47 @@ +/* + * Copyright 2014, 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.psi.impl; + +import com.intellij.lang.ASTNode; +import org.jetbrains.annotations.NotNull; +import org.jf.smalidea.psi.SmaliElementTypes; +import org.jf.smalidea.psi.stub.SmaliClassStub; + +public class SmaliClass extends SmaliStubBasedPsiElement { + public SmaliClass(@NotNull SmaliClassStub stub) { + super(stub, SmaliElementTypes.CLASS); + } + + public SmaliClass(@NotNull ASTNode node) { + super(node); + } +} diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliStubBasedPsiElement.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliStubBasedPsiElement.java new file mode 100644 index 00000000..194bb268 --- /dev/null +++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliStubBasedPsiElement.java @@ -0,0 +1,50 @@ +/* + * Copyright 2014, 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.psi.impl; + +import com.intellij.extapi.psi.StubBasedPsiElementBase; +import com.intellij.lang.ASTNode; +import com.intellij.psi.StubBasedPsiElement; +import com.intellij.psi.stubs.IStubElementType; +import com.intellij.psi.stubs.StubElement; +import org.jetbrains.annotations.NotNull; + +public abstract class SmaliStubBasedPsiElement extends StubBasedPsiElementBase + implements StubBasedPsiElement { + protected SmaliStubBasedPsiElement(@NotNull T stub, @NotNull IStubElementType nodeType) { + super(stub, nodeType); + } + + protected SmaliStubBasedPsiElement(@NotNull ASTNode node) { + super(node); + } +} diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliClassStub.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliClassStub.java new file mode 100644 index 00000000..b1656a59 --- /dev/null +++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliClassStub.java @@ -0,0 +1,43 @@ +/* + * Copyright 2014, 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.psi.stub; + +import com.intellij.psi.stubs.StubBase; +import com.intellij.psi.stubs.StubElement; +import org.jf.smalidea.psi.SmaliElementTypes; +import org.jf.smalidea.psi.impl.SmaliClass; + +public class SmaliClassStub extends StubBase { + public SmaliClassStub(StubElement parent) { + super(parent, SmaliElementTypes.CLASS); + } +} diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliStubElementType.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliStubElementType.java new file mode 100644 index 00000000..d5047b04 --- /dev/null +++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/SmaliStubElementType.java @@ -0,0 +1,49 @@ +/* + * Copyright 2014, 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.psi.stub; + +import com.intellij.lang.ASTNode; +import com.intellij.psi.PsiElement; +import com.intellij.psi.stubs.IStubElementType; +import com.intellij.psi.stubs.StubElement; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jf.smalidea.SmaliLanguage; + +public abstract class SmaliStubElementType + extends IStubElementType { + protected SmaliStubElementType(@NotNull @NonNls String debugName) { + super(debugName, SmaliLanguage.INSTANCE); + } + + public abstract PsiT createPsi(@NotNull ASTNode node); +} diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java new file mode 100644 index 00000000..83446614 --- /dev/null +++ b/smalidea/src/main/java/org/jf/smalidea/psi/stub/element/SmaliClassElementType.java @@ -0,0 +1,80 @@ +/* + * Copyright 2014, 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.psi.stub.element; + +import com.intellij.lang.ASTNode; +import com.intellij.psi.stubs.IndexSink; +import com.intellij.psi.stubs.StubElement; +import com.intellij.psi.stubs.StubInputStream; +import com.intellij.psi.stubs.StubOutputStream; +import org.jetbrains.annotations.NotNull; +import org.jf.smalidea.psi.impl.SmaliClass; +import org.jf.smalidea.psi.stub.SmaliClassStub; +import org.jf.smalidea.psi.stub.SmaliStubElementType; + +import java.io.IOException; + +public class SmaliClassElementType extends SmaliStubElementType { + public static final SmaliClassElementType INSTANCE = new SmaliClassElementType(); + + private SmaliClassElementType() { + super("CLASS"); + } + + @NotNull @Override public String getExternalId() { + return "smali.class"; + } + + @Override public SmaliClass createPsi(@NotNull SmaliClassStub stub) { + return new SmaliClass(stub); + } + + @Override public SmaliClass createPsi(@NotNull ASTNode node) { + return new SmaliClass(node); + } + + @Override public SmaliClassStub createStub(@NotNull SmaliClass psi, StubElement parentStub) { + return new SmaliClassStub(parentStub); + } + + @Override + public void serialize(@NotNull SmaliClassStub stub, @NotNull StubOutputStream dataStream) throws IOException { + } + + @NotNull @Override + public SmaliClassStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException { + return new SmaliClassStub(parentStub); + } + + @Override public void indexStub(@NotNull SmaliClassStub stub, @NotNull IndexSink sink) { + } +}