@@ -19,11 +19,16 @@ namespace Winterdom.VisualStudio.Extensions.Text { [Name(Constants.LINQ_CLASSIF_NAME)] internal static ClassificationTypeDefinition LinqKeywordClassificationType = null; } + static class VisibilityKeywordClassificationDefinition { + [Export(typeof(ClassificationTypeDefinition))] + [Name(Constants.VISIBILITY_CLASSIF_NAME)] + internal static ClassificationTypeDefinition VisibilityKeywordClassificationType = null; + } [Export(typeof(EditorFormatDefinition))] [ClassificationType(ClassificationTypeNames = Constants.CLASSIF_NAME)] [Name(Constants.CLASSIF_NAME)] - [DisplayName("Flow Control Keyword")] + [DisplayName("Keyword - Flow Control")] [UserVisible(true)] [Order(After = Priority.High)] sealed class FlowControlFormat : ClassificationFormatDefinition { @@ -36,7 +41,7 @@ namespace Winterdom.VisualStudio.Extensions.Text { [Export(typeof(EditorFormatDefinition))] [ClassificationType(ClassificationTypeNames = Constants.LINQ_CLASSIF_NAME)] [Name(Constants.LINQ_CLASSIF_NAME)] - [DisplayName("LINQ Operators")] + [DisplayName("Operator - LINQ")] [UserVisible(true)] [Order(After = Priority.High)] sealed class LinqKeywordFormat : ClassificationFormatDefinition { @@ -44,4 +49,16 @@ namespace Winterdom.VisualStudio.Extensions.Text { this.ForegroundColor = Colors.MediumSeaGreen; } } + [Export(typeof(EditorFormatDefinition))] + [ClassificationType(ClassificationTypeNames = Constants.VISIBILITY_CLASSIF_NAME)] + [Name(Constants.VISIBILITY_CLASSIF_NAME)] + [DisplayName("Keyword - Visibility")] + [UserVisible(true)] + [Order(After = Priority.High)] + sealed class VisibilityKeywordFormat : ClassificationFormatDefinition { + public VisibilityKeywordFormat() { + this.ForegroundColor = Colors.DimGray; + this.IsBold = true; + } + } } Classifications.cs @@ -12,6 +12,7 @@ namespace Winterdom.VisualStudio.Extensions.Text { static class Constants { public const String CLASSIF_NAME = "FlowControl"; public const String LINQ_CLASSIF_NAME = "LinqOperator"; + public const String VISIBILITY_CLASSIF_NAME = "VisibilityKeyword"; } [Export(typeof(IClassifierProvider))] @@ -46,6 +47,7 @@ namespace Winterdom.VisualStudio.Extensions.Text { class KeywordClassifier : IClassifier { private IClassificationType keywordClassification; private IClassificationType linqClassification; + private IClassificationType visClassification; private IClassifier classifier; #pragma warning disable 67 @@ -57,6 +59,7 @@ namespace Winterdom.VisualStudio.Extensions.Text { IClassifier classifier) { keywordClassification = registry.GetClassificationType(Constants.CLASSIF_NAME); linqClassification = registry.GetClassificationType(Constants.LINQ_CLASSIF_NAME); + visClassification = registry.GetClassificationType(Constants.VISIBILITY_CLASSIF_NAME); this.classifier = classifier; } @@ -82,13 +85,20 @@ namespace Winterdom.VisualStudio.Extensions.Text { list.AddRange(controlFlowSpans.Select( cfs => new ClassificationSpan(cfs, keywordClassification) )); + var linqSpans = from kwSpan in classifiedSpans where keywords.Linq.Contains(kwSpan.GetText()) select kwSpan; - list.AddRange(linqSpans.Select( cfs => new ClassificationSpan(cfs, linqClassification) )); + + var visSpans = from kwSpan in classifiedSpans + where keywords.Visibility.Contains(kwSpan.GetText()) + select kwSpan; + list.AddRange(visSpans.Select( + cfs => new ClassificationSpan(cfs, visClassification) + )); return list; } FlowControlClassifier.cs @@ -7,6 +7,7 @@ namespace Winterdom.VisualStudio.Extensions.Text { interface ILanguageKeywords { String[] ControlFlow { get; } String[] Linq { get; } + String[] Visibility { get; } } class CSharp : ILanguageKeywords { @@ -20,12 +21,18 @@ namespace Winterdom.VisualStudio.Extensions.Text { "by", "on", "equals", "into", "from", "descending", "ascending" }; + static readonly String[] CS_VIS_KEYWORDS = { + "public", "private", "protected", "internal" + }; public String[] ControlFlow { get { return CS_KEYWORDS; } } public String[] Linq { get { return CS_LINQ_KEYWORDS; } } + public String[] Visibility { + get { return CS_VIS_KEYWORDS; } + } } class Cpp : ILanguageKeywords { public const String ContentType = "C/C++"; @@ -33,11 +40,17 @@ namespace Winterdom.VisualStudio.Extensions.Text { "if", "else", "while", "do", "for", "each", "switch", "break", "continue", "return", "goto", "throw" }; + static readonly String[] CPP_VIS_KEYWORDS = { + "public", "private", "protected", "internal" + }; public String[] ControlFlow { get { return CPP_KEYWORDS; } } public String[] Linq { get { return new String[0]; } } + public String[] Visibility { + get { return CPP_VIS_KEYWORDS; } + } } } LanguageItems.cs 2ff7a661c721e3065b345b72de21465a10c9035f Tomas Restrepo tomas@winterdom.com http://github.com/tomasr/KeywordClassifier/commit/ab6c533aba15bc5f737ef3568e73bb47fbb6b211 ab6c533aba15bc5f737ef3568e73bb47fbb6b211 2009-06-14T08:40:44-07:00 2009-06-14T08:40:44-07:00 Added support for changing color of visibility keywords as well d4d039934eae5edd6d412a2f7d81e726a4766c40 Tomas Restrepo tomas@winterdom.com