Merge pull request #20 from rainers/master

changes for 0.3.38-rc3

Author: rainers

VERSION

@@ -2,4 +2,4 @@
 #define VERSION_MINOR      3
 #define VERSION_REVISION   38
 #define VERSION_BETA       -rc
-#define VERSION_BUILD      2
+#define VERSION_BUILD      3

vdc/abothe/Parser

@@ -175,6 +175,8 @@ public string VisitAttribute(NegatedDeclarationCondition a)
 			#endregion
 		}
 
+		public void SetSuggestedItem(string item) { }
+
 		/// <summary>
 		/// Adds a node to the completion data
 		/// </summary>

vdc/abothe/comserver/VDServerCompletionDataGenerator.cs

@@ -1370,3 +1370,41 @@ string operatorName(int id)
 			assert(false);
 	}
 }
+
+enum case_TOKs_BasicTypeX = q{
+	case TOK_bool:
+	case TOK_byte:
+	case TOK_ubyte:
+	case TOK_short:
+	case TOK_ushort:
+	case TOK_int:
+	case TOK_uint:
+	case TOK_long:
+	case TOK_ulong:
+	case TOK_char:
+	case TOK_wchar:
+	case TOK_dchar:
+	case TOK_float:
+	case TOK_double:
+	case TOK_real:
+	case TOK_ifloat:
+	case TOK_idouble:
+	case TOK_ireal:
+	case TOK_cfloat:
+	case TOK_cdouble:
+	case TOK_creal:
+	case TOK_void:
+};
+
+enum case_TOKs_TemplateSingleArgument = q{
+	case TOK_Identifier:
+	case TOK_CharacterLiteral:
+	case TOK_StringLiteral:
+	case TOK_IntegerLiteral:
+	case TOK_FloatLiteral:
+	case TOK_true:
+	case TOK_false:
+	case TOK_null:
+	case TOK___FILE__:
+	case TOK___LINE__:
+}; // + case_TOKs_BasicTypeX;

vdc/lexer.d

@@ -638,30 +638,6 @@ bool isTypeModifier(TokenId tok)
 //    cdouble
 //    creal
 //    void
-enum case_TOKs_BasicTypeX = q{
-		case TOK_bool:
-		case TOK_byte:
-		case TOK_ubyte:
-		case TOK_short:
-		case TOK_ushort:
-		case TOK_int:
-		case TOK_uint:
-		case TOK_long:
-		case TOK_ulong:
-		case TOK_char:
-		case TOK_wchar:
-		case TOK_dchar:
-		case TOK_float:
-		case TOK_double:
-		case TOK_real:
-		case TOK_ifloat:
-		case TOK_idouble:
-		case TOK_ireal:
-		case TOK_cfloat:
-		case TOK_cdouble:
-		case TOK_creal:
-		case TOK_void:
-};
 
 bool isBasicTypeX(TokenId tok)
 {

vdc/parser/decl.d

@@ -235,18 +235,6 @@ class TemplateArgumentList
 //    null
 //    __FILE__
 //    __LINE__
-enum case_TOKs_TemplateSingleArgument = q{
-	case TOK_Identifier:
-	case TOK_CharacterLiteral:
-	case TOK_StringLiteral:
-	case TOK_IntegerLiteral:
-	case TOK_FloatLiteral:
-	case TOK_true:
-	case TOK_false:
-	case TOK_null:
-	case TOK___FILE__:
-	case TOK___LINE__:
-}; // case_TOKs_BasicTypeX;
 
 //-- GRAMMAR_BEGIN --
 //TemplateTypeParameter:

vdc/parser/tmpl.d

@@ -430,19 +430,40 @@ class Declarations
 
 		if(symbols.length > 0 && mPendingSource)
 		{
-			if(symbols.length > 10 && mNames.length + symbols.length > 50)
+			// split after second ':' to combine same name and type
+			static string splitName(string name, ref string desc)
 			{
-				// go through assoc array for faster uniqueness check
-				bool[string] names;
-				foreach(n; mNames)
-					names[n] = true;
-				foreach(s; symbols)
-					names[s] = true;
-				mNames = names.keys();
+				auto pos = name.indexOf(':');
+				if(pos < 0)
+					return name;
+				pos = name.indexOf(':', pos + 1);
+				if(pos < 0)
+					return name;
+				desc = name[pos..$];
+				return name[0..pos];
 			}
-			else
-				foreach(s; symbols)
-					mNames.addunique(s);
+
+			// go through assoc array for faster uniqueness check
+			string[string] names;
+			foreach(n; mNames)
+			{
+				string desc;
+				string name = splitName(n, desc);
+				names[name] = desc;
+			}
+			foreach(s; symbols)
+			{
+				string desc;
+				string name = splitName(s, desc);
+				if(auto p = name in names)
+					*p ~= "\a\a" ~ desc[1..$]; // strip ":"
+				else
+					names[name] = desc;
+			}
+			mNames.length = names.length;
+			size_t i = 0;
+			foreach(n, desc; names)
+				mNames[i++] = n ~ desc;
 
 			sort!("icmp(a, b) < 0", SwapStrategy.stable)(mNames);
 			mPendingSource.GetCompletionSet().Init(mPendingView, this, false);

visuald/completion.d

@@ -41,8 +41,6 @@ extern (C) GCStats gc_stats();
 }
 
 import vdc.lexer;
-import vdc.parser.tmpl;
-import vdc.parser.decl;
 import vdc.ivdserver;
 static import vdc.util;