Remove translation unit class

Darkyenus · Jul 9, 2015 · b877d4d · b877d4d
1 parent fb14c91
commit b877d4d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 75 deletions.
diff --git a/src/glslplugin/lang/elements/GLSLTranslationUnit.java b/src/glslplugin/lang/elements/GLSLTranslationUnit.java
diff --git a/src/glslplugin/structureview/GLSLFileTreeElement.java b/src/glslplugin/structureview/GLSLFileTreeElement.java
@@ -21,7 +21,6 @@
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import glslplugin.lang.elements.GLSLTranslationUnit;
 import glslplugin.lang.elements.GLSLTypedElement;
 import glslplugin.lang.elements.declarations.*;
 
@@ -45,48 +44,41 @@ protected void createChildren(PsiFile file) {
         List<GLSLVariableDeclaration> variableDeclarations = new ArrayList<GLSLVariableDeclaration>();
         List<GLSLFunctionDeclaration> functions = new ArrayList<GLSLFunctionDeclaration>();
 
-        PsiElement translationUnit = file.getFirstChild();
-        while (translationUnit != null && !(translationUnit instanceof GLSLTranslationUnit)) {
-            translationUnit = translationUnit.getNextSibling();
-        }
-
-        if (translationUnit != null) {
-            PsiElement[] baseNodes = translationUnit.getChildren();
-            for (PsiElement baseNode : baseNodes) {
-                if (baseNode instanceof GLSLVariableDeclaration) {
-                    final GLSLVariableDeclaration declaration = (GLSLVariableDeclaration) baseNode;
-                    //TODO Check if this accounts for shortcomings of getTypeSpecifierNode() (probably not)
-                    final GLSLTypeSpecifier typeSpecifier = declaration.getTypeSpecifierNode();
+        PsiElement[] baseNodes = file.getChildren();
+        for (PsiElement baseNode : baseNodes) {
+            if (baseNode instanceof GLSLVariableDeclaration) {
+                final GLSLVariableDeclaration declaration = (GLSLVariableDeclaration) baseNode;
+                //TODO Check if this accounts for shortcomings of getTypeSpecifierNode() (probably not)
+                final GLSLTypeSpecifier typeSpecifier = declaration.getTypeSpecifierNode();
 
-                    if(typeSpecifier != null){
-                        final GLSLTypedElement typedef = typeSpecifier.getTypeDefinition();
-                        if (typedef instanceof GLSLTypeDefinition) {
-                            final GLSLTypeDefinition definition = (GLSLTypeDefinition) typedef;
-                            definitions.add(definition);
-                        }
+                if (typeSpecifier != null) {
+                    final GLSLTypedElement typedef = typeSpecifier.getTypeDefinition();
+                    if (typedef != null) {
+                        final GLSLTypeDefinition definition = (GLSLTypeDefinition) typedef;
+                        definitions.add(definition);
+                    }
 
-                        if (declaration.getDeclarators().length > 0) {
-                            variableDeclarations.add(declaration);
-                        }
+                    if (declaration.getDeclarators().length > 0) {
+                        variableDeclarations.add(declaration);
                     }
-                } else if (baseNode instanceof GLSLFunctionDeclaration) {
-                    functions.add((GLSLFunctionDeclaration) baseNode);
                 }
+            } else if (baseNode instanceof GLSLFunctionDeclaration) {
+                functions.add((GLSLFunctionDeclaration) baseNode);
             }
+        }
 
-            for (GLSLTypeDefinition definition : definitions) {
-                addChild(new GLSLStructTreeElement(definition));
-            }
+        for (GLSLTypeDefinition definition : definitions) {
+            addChild(new GLSLStructTreeElement(definition));
+        }
 
-            for (GLSLVariableDeclaration declaration : variableDeclarations) {
-                for (GLSLDeclarator declarator : declaration.getDeclarators()) {
-                    addChild(new GLSLDeclaratorTreeElement(declarator));
-                }
+        for (GLSLVariableDeclaration declaration : variableDeclarations) {
+            for (GLSLDeclarator declarator : declaration.getDeclarators()) {
+                addChild(new GLSLDeclaratorTreeElement(declarator));
             }
+        }
 
-            for (GLSLFunctionDeclaration function : functions) {
-                addChild(new GLSLFunctionTreeElement((GLSLFunctionDeclarationImpl) function));
-            }
+        for (GLSLFunctionDeclaration function : functions) {
+            addChild(new GLSLFunctionTreeElement((GLSLFunctionDeclarationImpl) function));
         }
     }
 }