add option to disable field/alias resolution for semantic highlighting

Author: rainers

vdc/abothe/comserver/CodeSemantics/IdentifierTypesGenerator.cs

@@ -25,7 +25,7 @@ protected override string Process(
 			{
 				var invalidCodeRegions = new List<ISyntaxRegion>();
 				var textLocationsToHighlight =
-					TypeReferenceFinder.Scan(editorData, editorData.CancelToken, true, invalidCodeRegions);
+					TypeReferenceFinder.Scan(editorData, editorData.CancelToken, resolveTypes, invalidCodeRegions);
 				return TextLocationsToIdentifierSpans(textLocationsToHighlight);
 			}
 			catch (Exception ex)

visuald/dlangsvc.d

@@ -4038,7 +4038,8 @@ else
 		Package.GetTaskProvider().updateTaskItems(filename, tasks);
 
 		if (Package.GetGlobalOptions().semanticHighlighting)
-			Package.GetLanguageService().GetIdentifierTypes(this, 0, -1, true, &OnUpdateIdentifierTypes);
+			Package.GetLanguageService().GetIdentifierTypes(this, 0, -1, Package.GetGlobalOptions().semanticResolveFields,
+															&OnUpdateIdentifierTypes);
 	}
 
 	void updateParseErrors(string err)

visuald/dpackage.d

@@ -1342,6 +1342,7 @@ class GlobalOptions
 	bool showTypeInTooltip;
 	bool showValueInTooltip;
 	bool semanticHighlighting;
+	bool semanticResolveFields;
 	bool semanticGotoDef = true;
 	bool useDParser;
 	bool mixinAnalysis;
@@ -1678,7 +1679,8 @@ class GlobalOptions
 			expandTrigger       = cast(byte) getIntOpt("expandTrigger", 0);
 			showTypeInTooltip   = getBoolOpt("showTypeInTooltip2", true); // changed default
 			showValueInTooltip  = getBoolOpt("showValueInTooltip", false);
-			semanticHighlighting= getBoolOpt("semanticHighlighting", false);
+			semanticHighlighting  = getBoolOpt("semanticHighlighting", false);
+			semanticResolveFields = getBoolOpt("semanticResolveFields", false);
 			//semanticGotoDef     = getBoolOpt("semanticGotoDef", true);
 			pasteIndent         = getBoolOpt("pasteIndent", true);
 			fmtIndentCase       = getBoolOpt("fmtIndentCase", true);
@@ -1947,6 +1949,7 @@ class GlobalOptions
 			keyToolOpts.Set("showTypeInTooltip2",  showTypeInTooltip);
 			keyToolOpts.Set("showValueInTooltip",  showValueInTooltip);
 			keyToolOpts.Set("semanticHighlighting",  semanticHighlighting);
+			keyToolOpts.Set("semanticResolveFields", semanticResolveFields);
 			//keyToolOpts.Set("semanticGotoDef",     semanticGotoDef);
 			keyToolOpts.Set("useDParser2",         useDParser);
 			keyToolOpts.Set("mixinAnalysis",       mixinAnalysis);

visuald/propertypage.d

@@ -2416,15 +2416,16 @@ class ColorizerPropertyPage : GlobalPropertyPage
 	this(GlobalOptions options)
 	{
 		super(options);
-		kNeededLines = 14;
+		kNeededLines = 15;
 	}
 
 	override void CreateControls()
 	{
 		mLinesPerMultiLine = 3;
 		AddTitleLine("Colorizer");
 		AddControl("", mColorizeVersions = new CheckBox(mCanvas, "Colorize version and debug statements"));
-		AddControl("", mSemanticHighlighting = new CheckBox(mCanvas, "Colorize types from semantic analysis (experimental)"));
+		AddControl("", mSemanticHighlighting = new CheckBox(mCanvas, "Colorize identifiers from semantic analysis (experimental)"));
+		AddControl("", mResolveFields = new CheckBox(mCanvas, "   resolving fields and aliases (can be slow)"));
 		AddControl("Colored types", mUserTypes = new MultiLineText(mCanvas), 1000);
 		AddTitleLine("Coverage");
 		AddControl("", mColorizeCoverage = new CheckBox(mCanvas, "Colorize coverage from .LST file"));
@@ -2441,6 +2442,7 @@ class ColorizerPropertyPage : GlobalPropertyPage
 	{
 		mColorizeVersions.setChecked(opts.ColorizeVersions);
 		mSemanticHighlighting.setChecked(opts.semanticHighlighting);
+		mResolveFields.setChecked(opts.semanticResolveFields);
 		mColorizeCoverage.setChecked(opts.ColorizeCoverage);
 		mShowCoverageMargin.setChecked(opts.showCoverageMargin);
 		mAutoOutlining.setChecked(opts.autoOutlining);
@@ -2457,6 +2459,7 @@ class ColorizerPropertyPage : GlobalPropertyPage
 		int changes = 0;
 		changes += changeOption(mColorizeVersions.isChecked(), opts.ColorizeVersions, refopts.ColorizeVersions);
 		changes += changeOption(mSemanticHighlighting.isChecked(), opts.semanticHighlighting, refopts.semanticHighlighting);
+		changes += changeOption(mResolveFields.isChecked(), opts.semanticResolveFields, refopts.semanticResolveFields);
 		changes += changeOption(mColorizeCoverage.isChecked(), opts.ColorizeCoverage, refopts.ColorizeCoverage);
 		changes += changeOption(mShowCoverageMargin.isChecked(), opts.showCoverageMargin, refopts.showCoverageMargin);
 		changes += changeOption(mAutoOutlining.isChecked(), opts.autoOutlining, refopts.autoOutlining);
@@ -2469,6 +2472,7 @@ class ColorizerPropertyPage : GlobalPropertyPage
 
 	CheckBox mColorizeVersions;
 	CheckBox mSemanticHighlighting;
+	CheckBox mResolveFields;
 	CheckBox mColorizeCoverage;
 	CheckBox mShowCoverageMargin;
 	CheckBox mAutoOutlining;