Merge pull request #16 from rainers/master

changes for 0.3.38-rc2

Author: rainers

CHANGES

@@ -610,21 +610,23 @@ unreleased Version 0.3.38
   * tool tips now expand some Ddoc macros for better readability
 
   * update SDK conversion for VS2013 and Windws SDK 8.1
-  * change some default colors when using dark theme in VS 2012+ (restart required)
+  * bugzilla 11786: change some default colors when using dark theme in VS 2012+ (restart required)
   * Windows SDK 8.0/8.1 detection
   * fix bad "\n" in default x64 library search path
   * x64 executable and library search path not correctly saved for next VS start
-  * improve project automation to mute NuGet (still empty project pretended)
+  * bugzilla 12052: improve project automation to mute NuGet (still empty project pretended)
 
   * add source control support for git in VS2013 (and maybe others)
   * fix DnD of project items in VS2013
-  * disguise functionality of pipedmd.exe and filemonitor.dll to let it pass 
+  * bugzilla 12187: disguise functionality of pipedmd.exe and filemonitor.dll to let it pass 
     most anti-virus checks
-  * added option to select the C runtime library when compiling for x64
+  * bugzilla 11962: added option to select the C runtime library when compiling for x64
 
-  * completion on import statements no longer showed folder icons
-  * completion on selective import now lists identifiers from imported module
+  * bugzilla 11940: completion on import statements no longer showed folder icons
+  * bugzilla 11649: completion on selective import now lists identifiers from imported module
   * dparser: fixed completion for symbols without description
   * dparser: added support for multi line completions (including override completion)
+  * parameter tool tips now use prototype from dparser and shows documentation
 
-  * cv2pdb: modified visualizer for void[] to also show bytes
+  * bugzilla 11898: cv2pdb: modified visualizer for void[] to also show bytes
+  * bugzilla 12353: option "Show Type In Tooltip" not saved and restored across restart

TODO

@@ -39,7 +39,7 @@ Project:
 - custom command: quotes in dependencies not supported
 - VS2013: property pages don't follow resize
 - custom command: writes build batch to source folder
-- VS2013: moving project item with DnD does not remove source
+- VS2013: possible to copy a project item with DnD into the same project again
 
 Language service:
 -----------------

VERSION

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

vdc/abothe/VDServer.cs

@@ -55,6 +55,11 @@ public VDServerCompletionDataGenerator (string pre)
 			prefix = pre;
 		}
 
+		public void NotifyTimeout()
+		{
+
+		}
+
 		/// <summary>
 		/// Adds a token entry
 		/// </summary>
@@ -115,8 +120,8 @@ public void Add(INode Node)
 				type = "MOD";
 
 			string desc = Node.Description;
-            if(!string.IsNullOrEmpty(desc))
-                desc = desc.Trim();
+			if(!string.IsNullOrEmpty(desc))
+				desc = desc.Trim();
 
 			string proto = VDServerCompletionDataGenerator.GeneratePrototype(Node);
 			if (!string.IsNullOrEmpty(proto) && !string.IsNullOrEmpty(desc))
@@ -169,8 +174,6 @@ public static string GeneratePrototype(INode node, int currentParameter = -1, bo
 				return VDServerCompletionDataGenerator.GeneratePrototype(node as DVariable);
 			if(node is DelegateType)
 				return VDServerCompletionDataGenerator.GeneratePrototype(node as DelegateType, currentParameter);
-			if(node is DelegateDeclaration)
-				return VDServerCompletionDataGenerator.GeneratePrototype(node as DelegateDeclaration, currentParameter);
 			if(node is AbstractType)
 				return VDServerCompletionDataGenerator.GeneratePrototype(node as AbstractType, currentParameter, isInTemplateArgInsight);
 			return null;
@@ -183,57 +186,56 @@ public static string GeneratePrototype(AbstractType t, int currentParameter = -1
 			{
 				if (ms.Definition is DVariable)
 				{
-					var bt = DResolver.StripAliasSymbol(ms.Base);
+					var bt = ms.Base;
 					if (bt is DelegateType)
-						return VDServerCompletionDataGenerator.GeneratePrototype(bt as DelegateType, currentParameter);
+                        return VDServerCompletionDataGenerator.GeneratePrototype(bt as DelegateType, isInTemplateArgInsight, currentParameter);
 				}
 				else if (ms.Definition is DMethod)
 					return VDServerCompletionDataGenerator.GeneratePrototype(ms.Definition as DMethod, isInTemplateArgInsight, currentParameter);
 			}
-			else if (t is TemplateIntermediateType)
-				return VDServerCompletionDataGenerator.GeneratePrototype(t as TemplateIntermediateType, currentParameter);
+            else if (t is TemplateIntermediateType || t is EponymousTemplateType)
+				return VDServerCompletionDataGenerator.GeneratePrototype(t as DSymbol, currentParameter);
 
 			return null;
 		}
 
-		public static string GeneratePrototype(DelegateType dt, int currentParam = -1)
-		{
-			var dd = dt.TypeDeclarationOf as DelegateDeclaration;
-			if (dd != null)
-				return VDServerCompletionDataGenerator.GeneratePrototype(dd, currentParam);
-
-			return null;
-		}
-
-		public static string GeneratePrototype(DelegateDeclaration dd, int currentParam = -1)
+		public static string GeneratePrototype(DelegateType dd, bool isInTemplateArgInsight, int currentParam = -1)
 		{
 			var sb = new StringBuilder("Delegate: ");
 
 			if (dd.ReturnType != null)
-				sb.Append(dd.ReturnType.ToString(true)).Append(' ');
+				sb.Append(dd.ReturnType.ToString()).Append(' ');
 
 			if (dd.IsFunction)
 				sb.Append("function");
 			else
 				sb.Append("delegate");
 
-			sb.Append('(');
-			if (dd.Parameters != null && dd.Parameters.Count != 0)
+			var fn = dd.DeclarationOrExpressionBase as D_Parser.Dom.Expressions.FunctionLiteral;
+			if (fn != null)
+				RenderParametersAndFooters(fn.AnonymousMethod, sb, isInTemplateArgInsight, currentParam);
+			else
 			{
-				for (int i = 0; i < dd.Parameters.Count; i++)
+				sb.Append('(');
+				var parms = dd.Parameters;
+				if (parms != null && parms.Length != 0)
 				{
-					var p = dd.Parameters[i] as DNode;
-					if (i == currentParam)
+					for (int i = 0; i < parms.Length; i++)
 					{
-						sb.Append(p.ToString(false)).Append(',');
+						if (i == currentParam)
+							sb.Append("<u>");
+
+						sb.Append(parms[i] is DSymbol ? (parms[i] as DSymbol).Definition.ToString(true, false) : parms[i].ToCode());
+
+						if (i == currentParam)
+							sb.Append("</u>");
+						sb.Append(',');
 					}
-					else
-						sb.Append(p.ToString(false)).Append(',');
-				}
 
-				sb.Remove(sb.Length - 1, 1);
+					sb.Remove(sb.Length - 1, 1);
+				}
+				sb.Append(')');
 			}
-			sb.Append(')');
 
 			return sb.ToString();
 		}
@@ -300,6 +302,12 @@ public static string GeneratePrototype(DMethod dm, bool isTemplateParamInsight=f
 
 			sb.Append(name);
 
+			RenderParametersAndFooters(dm, sb, isTemplateParamInsight, currentParam);
+			return sb.ToString();
+		}
+
+		static void RenderParametersAndFooters(DMethod dm, StringBuilder sb, bool isTemplateParamInsight, int currentParam = -1)
+		{
 			// Template parameters
 			if (dm.TemplateParameters != null && dm.TemplateParameters.Length > 0)
 			{
@@ -340,7 +348,6 @@ public static string GeneratePrototype(DMethod dm, bool isTemplateParamInsight=f
 			}
 
 			sb.Append(")");
-			return sb.ToString();
 		}
 
 		public static string GeneratePrototype(TemplateIntermediateType tit, int currentParam = -1)
@@ -488,7 +495,7 @@ public void GetTip(string filename, int startLine, int startIndex, int endLine,
 				foreach (var c in content) 
 				{
 					if (!string.IsNullOrEmpty (_tipText))
-						_tipText += "\n\n";
+						_tipText += "\a";
 					if (string.IsNullOrWhiteSpace (c.Description))
 						_tipText += c.Title;
 					else
@@ -601,10 +608,9 @@ public void GetDefinition(string filename, int startLine, int startIndex, int en
 			var rr = DResolver.ResolveType(_editorData, ctxt);
 
 			_tipText = "";
-			if (rr != null && rr.Length > 0)
+			if (rr != null)
 			{
-				var res = rr[rr.Length - 1];				
-				var n = DResolver.GetResultMember(res);
+				var n = DResolver.GetResultMember(rr);
 
 				_tipStart = n.Location;
 				_tipEnd = n.EndLocation;
@@ -656,6 +662,7 @@ void _setupEditorData()
             CompletionOptions.Instance.ShowUFCSItems = (_flags & 0x2000000) != 0;
             CompletionOptions.Instance.DisableMixinAnalysis = (_flags & 0x1000000) == 0;
 			CompletionOptions.Instance.HideDeprecatedNodes = (_flags & 128) != 0;
+            CompletionOptions.Instance.CompletionTimeout = 500;
 		}
 
 #if false

visuald/completion.d

@@ -1069,7 +1069,10 @@ class MethodData : DisposingComObject, IVsMethodData
 				break;
 
 			case MTT_DESCRIPTION:
-				result = format("%s %s @ %s(%d)", mMethods[method].kind, mMethods[method].inScope, mMethods[method].filename, mMethods[method].line);
+				if(mMethods[method].help)
+					result = phobosDdocExpand(mMethods[method].help);
+				else if(mMethods[method].line > 0)
+					result = format("%s %s @ %s(%d)", mMethods[method].kind, mMethods[method].inScope, mMethods[method].filename, mMethods[method].line);
 				break;
 
 			case MTT_TYPEPREFIX:

visuald/dlangsvc.d

@@ -3120,7 +3120,7 @@ else
 		return false;
 	}
 
-	wstring FindIdentifierBackward(int line, int tok)
+	wstring FindIdentifierBackward(int line, int tok, int* pline, int* pindex)
 	{
 		while(line >= 0)
 		{
@@ -3144,7 +3144,13 @@ else
 			{
 				pos = tokpos[p];
 				if(toktype[p] == TokenCat.Identifier)
+				{
+					if(pline)
+						*pline = line;
+					if(pindex)
+						*pindex = pos;
 					return text[pos .. ppos];
+				}
 				if(ppos > pos + 1 || !isWhite(text[pos]))
 					return ""w;
 				ppos = pos;

visuald/dpackage.d

@@ -1419,7 +1419,7 @@ class GlobalOptions
 			keyToolOpts.Set("expandFromBuffer",    expandFromBuffer);
 			keyToolOpts.Set("expandFromJSON",      expandFromJSON);
 			keyToolOpts.Set("expandTrigger",       expandTrigger);
-			keyToolOpts.Set("showTypeInTooltip",   showTypeInTooltip);
+			keyToolOpts.Set("showTypeInTooltip2",  showTypeInTooltip);
 			keyToolOpts.Set("semanticGotoDef",     semanticGotoDef);
 			keyToolOpts.Set("useDParser2",         useDParser);
 			keyToolOpts.Set("mixinAnalysis",       mixinAnalysis);

visuald/intellisense.d

@@ -613,6 +613,7 @@ struct Definition
 	string kind;
 	string filename;
 	string deco;
+	string help;
 	int line;
 
 	private string _type;
@@ -622,6 +623,10 @@ struct Definition
 			(cast()this)._type = demangleType(deco, name);
 		return _type; 
 	}
+	void setType(string t)
+	{
+		_type = t;
+	}
 
 	string inScope; // enclosing scope
 

visuald/viewfilter.d

@@ -424,7 +424,9 @@ version(tip)
 				break;
 
 			case ECMD_LEFT:
+			case ECMD_WORDPREV:
 			case ECMD_RIGHT:
+			case ECMD_WORDNEXT:
 				stopCompletions();
 				goto case ECMD_UP;
 
@@ -1400,7 +1402,7 @@ else
 			return S_FALSE;
 
 		tok = mCodeWinMgr.mSource.FindLineToken(otherLine, otherIndex, iState, pos);
-		string word = toUTF8(src.FindIdentifierBackward(otherLine, tok));
+		string word = toUTF8(src.FindIdentifierBackward(otherLine, tok, &line, &idx));
 		if(word.length <= 0)
 		{
 			line = otherLine;
@@ -1410,18 +1412,64 @@ else
 			goto stepUp;
 		}
 
-		Definition[] defs = Package.GetLibInfos().findDefinition(word);
+		span.iStartIndex = idx;
+		span.iStartLine = line;
+		span.iEndIndex = idx + 1;
+		span.iEndLine = line;
+
+		mPendingMethodTipWord = word;
+		mPendingMethodTipComma = cntComma;
+		mPendingRequest = Package.GetLanguageService().GetTip(mCodeWinMgr.mSource, &span, &OnGetMethodTipText);
+		return S_OK;
+	}
+
+	extern(D) void OnGetMethodTipText(uint request, string filename, string text, TextSpan span)
+	{
+		Definition[] defs;
+		string[] funcs = split(text, "\a");
+		if(funcs.empty)
+		{
+			defs = Package.GetLibInfos().findDefinition(mPendingMethodTipWord);
+		}
+		else
+		{
+			foreach(fn; funcs)
+			{
+				Definition def;
+				def.name = mPendingMethodTipWord;
+				int pos = fn.indexOf("\n");
+				if(pos >= 0)
+				{
+					def.help = fn[pos + 1 .. $];
+					if(def.help.startsWith("(Deduced Type"))
+						if(!findSkip(def.help, "\n"))
+							def.help = "";
+					fn = fn[0 .. pos];
+				}
+				if(fn.endsWith("\r"))
+					fn = fn[0..$-1];
+				if(fn.endsWith(":"))
+					fn = fn[0..$-1];
+				def.setType(fn);
+				defs ~= def;
+			}
+		}
+		RefreshMethodTip(defs, span);
+	}
+
+	int RefreshMethodTip(Definition[] defs, TextSpan span)
+	{
 		if(defs.length == 0)
 			return S_FALSE;
-		
-		MethodData md = src.GetMethodData();
+
+		MethodData md = mCodeWinMgr.mSource.GetMethodData();
 		span.iEndLine = span.iStartLine;
 		span.iEndIndex = span.iStartIndex + 1;
-		md.Refresh(mView, defs, cntComma, span);
-		
+		md.Refresh(mView, defs, mPendingMethodTipComma, span);
+
 		return S_OK;
 	}
-	
+
 	// IVsTextViewFilter //////////////////////////////////////
 	override int GetWordExtent(in int iLine, in CharIndex iIndex, in uint dwFlags, /* [out] */ TextSpan *pSpan)
 	{
@@ -1566,13 +1614,16 @@ version(none) // quick info tooltips not good enough yet
 	//////////////////////////////
 	TextSpan mPendingSpan;
 	uint mPendingRequest;
+	int mPendingMethodTipComma;
+	string mPendingMethodTipWord;
 	TextSpan mTipSpan;
 	string mTipText;
 	uint mTipRequest;
 	string mLastGotoDef;
 
 	extern(D) void OnGetTipText(uint request, string filename, string text, TextSpan span)
 	{
+		text = replace(text, "\a", "\n\n");
 		mTipText = phobosDdocExpand(text);
 
 		mTipSpan = span;