From 6aa7c6121a2ecbe78f14f8c3d7ddb55b8ddb10bd Mon Sep 17 00:00:00 2001
From: jeff
Date: Thu, 7 Aug 2014 00:55:43 -0400
Subject: started working on recognition of non-class member identifiers in the
 source got class extends,implements working and argument,field types added
 filtering to make sure highlighted class names are actually classes in the
 jar

---
 src/cuchaz/enigma/analysis/SourcedAst.java | 43 +++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 16 deletions(-)

(limited to 'src/cuchaz/enigma/analysis/SourcedAst.java')

diff --git a/src/cuchaz/enigma/analysis/SourcedAst.java b/src/cuchaz/enigma/analysis/SourcedAst.java
index 968c880..a88cc75 100644
--- a/src/cuchaz/enigma/analysis/SourcedAst.java
+++ b/src/cuchaz/enigma/analysis/SourcedAst.java
@@ -16,7 +16,6 @@ import java.util.HashMap;
 import javassist.bytecode.Descriptor;
 
 import com.google.common.collect.Maps;
-import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.CompilationUnitTree;
 import com.sun.source.tree.ImportTree;
 import com.sun.source.tree.Tree;
@@ -29,6 +28,7 @@ public class SourcedAst
 	private Trees m_trees;
 	private SourcePositions m_positions;
 	private HashMap<String,String> m_classNameIndex;
+	private String m_packageName;
 	
 	public SourcedAst( CompilationUnitTree tree, Trees trees )
 	{
@@ -49,6 +49,13 @@ public class SourcedAst
 			// get the full and simple class names
 			String fullName = Descriptor.toJvmName( importTree.getQualifiedIdentifier().toString() );
 			String simpleName = fullName;
+			
+			if( fullName.startsWith( "__DEFAULT__/" ) )
+			{
+				// remove the default package flag
+				fullName = fullName.substring( 12 );
+			}
+			
 			String[] parts = fullName.split( "/" );
 			if( parts.length > 0 )
 			{
@@ -58,30 +65,26 @@ public class SourcedAst
 			m_classNameIndex.put( simpleName, fullName );
 		}
 		
-		// index the self class using the package name
+		// get the package name
+		m_packageName = null;
 		if( m_tree.getPackageName() != null )
 		{
-			String packageName = Descriptor.toJvmName( m_tree.getPackageName().toString() );
-			for( Tree typeTree : m_tree.getTypeDecls() )
-			{
-				if( typeTree instanceof ClassTree )
-				{
-					ClassTree classTree = (ClassTree)typeTree;
-					String className = classTree.getSimpleName().toString();
-					m_classNameIndex.put( className, packageName + "/" + className );
-				}
-			}
+			m_packageName = Descriptor.toJvmName( m_tree.getPackageName().toString() );
 		}
 	}
 
 	public int getStart( Tree node )
 	{
-		return (int)m_positions.getStartPosition( m_tree, node );
+		int pos = (int)m_positions.getStartPosition( m_tree, node );
+		assert( pos >= 0 );
+		return pos;
 	}
 
 	public int getEnd( Tree node )
 	{
-		return (int)m_positions.getEndPosition( m_tree, node );
+		int pos = (int)m_positions.getEndPosition( m_tree, node );
+		assert( pos >= 0 );
+		return pos;
 	}
 	
 	public int getLine( Tree node )
@@ -121,8 +124,16 @@ public class SourcedAst
 		String fullClassName = m_classNameIndex.get( simpleClassName );
 		if( fullClassName == null )
 		{
-			// no mapping was found, the name is probably already fully-qualified
-			fullClassName = simpleClassName;
+			if( m_packageName != null )
+			{
+				// no mapping was found, assume it's in the package
+				fullClassName = m_packageName + "/" + simpleClassName;
+			}
+			else
+			{
+				// this must be in the default package
+				fullClassName = simpleClassName;
+			}
 		}
 		return fullClassName;
 	}
-- 
cgit v1.2.3