From c8d755f74398d37d5643eeee14595cca1c5efb46 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 14 Oct 2013 01:28:42 +0000
Subject: [PATCH] Added struct and class properties to completions

---
 actypes.d      | 18 ++++++++++++++----
 astconverter.d | 12 +-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/actypes.d b/actypes.d
index 5e85e6e..3164dfe 100644
--- a/actypes.d
+++ b/actypes.d
@@ -229,7 +229,6 @@ struct ImportInformation
  */
 static this()
 {
-    // TODO: make sure all parts are sorted.
 	auto bool_ = new ACSymbol("bool", CompletionKind.keyword);
 	auto int_ = new ACSymbol("int", CompletionKind.keyword);
 	auto long_ = new ACSymbol("long", CompletionKind.keyword);
@@ -246,12 +245,13 @@ static this()
 	auto alignof_ = new ACSymbol("alignof", CompletionKind.keyword, ulong_);
 	auto mangleof_ = new ACSymbol("mangleof", CompletionKind.keyword);
 	auto sizeof_ = new ACSymbol("sizeof", CompletionKind.keyword, ulong_);
-	auto stringof_ = new ACSymbol("stringof", CompletionKind.keyword);
+	auto stringof_ = new ACSymbol("init", CompletionKind.keyword);
+	auto init = new ACSymbol("stringof", CompletionKind.keyword);
 
 	arraySymbols ~= alignof_;
 	arraySymbols ~= new ACSymbol("dup", CompletionKind.keyword);
 	arraySymbols ~= new ACSymbol("idup", CompletionKind.keyword);
-	arraySymbols ~= new ACSymbol("init", CompletionKind.keyword);
+	arraySymbols ~= init;
 	arraySymbols ~= new ACSymbol("length", CompletionKind.keyword, ulong_);
 	arraySymbols ~= mangleof_;
 	arraySymbols ~= new ACSymbol("ptr", CompletionKind.keyword);
@@ -273,6 +273,7 @@ static this()
 	assocArraySymbols ~= new ACSymbol("rehash", CompletionKind.keyword);
 	assocArraySymbols ~= sizeof_;
 	assocArraySymbols ~= stringof_;
+	assocArraySymbols ~= init;
 	assocArraySymbols ~= new ACSymbol("values", CompletionKind.keyword);
 	assocArraySymbols.sort();
 
@@ -286,6 +287,7 @@ static this()
 		s.parts ~= sizeof_;
 		s.parts ~= stringof_;
 		s.parts ~= mangleof_;
+		s.parts ~= init;
 	}
 
 	auto cdouble_ = new ACSymbol("cdouble", CompletionKind.keyword);
@@ -322,6 +324,15 @@ static this()
 		s.parts ~= stringof_;
 	}
 
+	classSymbols ~= new ACSymbol("classInfo", CompletionKind.variableName);
+	classSymbols ~= new ACSymbol("tupleof", CompletionKind.variableName);
+	classSymbols ~= new ACSymbol("__vptr", CompletionKind.variableName);
+	classSymbols ~= new ACSymbol("__monitor", CompletionKind.variableName);
+	classSymbols ~= mangleof_;
+	classSymbols ~= alignof_;
+	classSymbols ~= sizeof_;
+	classSymbols ~= init;
+
 	ireal_.parts ~= new ACSymbol("im", CompletionKind.keyword, real_);
 	ifloat_.parts ~= new ACSymbol("im", CompletionKind.keyword, float_);
 	idouble_.parts ~= new ACSymbol("im", CompletionKind.keyword, double_);
@@ -362,6 +373,5 @@ const(ACSymbol)*[] builtinSymbols;
 const(ACSymbol)*[] arraySymbols;
 const(ACSymbol)*[] assocArraySymbols;
 const(ACSymbol)*[] classSymbols;
-const(ACSymbol)*[] structSymbols;
 Type argptrType;
 Type argumentsType;
diff --git a/astconverter.d b/astconverter.d
index 9f7e7ef..d96c6b6 100644
--- a/astconverter.d
+++ b/astconverter.d
@@ -341,19 +341,9 @@ private:
 	{
 
 //		Log.trace("visiting aggregate declaration ", dec.name.value);
-		CompletionKind k;
-		static if (is (AggType == ClassDeclaration))
-			k = CompletionKind.className;
-		else static if (is (AggType == InterfaceDeclaration))
-			k = CompletionKind.interfaceName;
-		else static if (is (AggType == StructDeclaration))
-			k = CompletionKind.structName;
-		else static if (is (AggType == UnionDeclaration))
-			k = CompletionKind.unionName;
-		else static assert (false, "Unhandled aggregate type " ~ AggType.stringof);
-
 		SemanticSymbol* symbol = new SemanticSymbol(dec.name.value.dup,
 			kind, symbolFile, dec.name.startIndex);
+		symbol.acSymbol.parts ~= classSymbols;
 		symbol.parent = currentSymbol;
 		symbol.protection = protection;
 		currentSymbol = symbol;