Skip to content

Commit 972434f

Browse files
author
David Roller
committed
Minor changes and refactoring
1 parent b56aae3 commit 972434f

12 files changed

+35
-77
lines changed

‎AutoItSyntaxHighlight/AutoItEditorClassifier.cs

-26
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,10 @@
2020

2121
namespace AutoItSyntaxHighlight
2222
{
23-
/// <summary>
24-
/// Classifier that classifies all text as an instance of the "AutoItEditorClassifier" classification type.
25-
/// </summary>
2623
internal class AutoItEditorClassifier : IClassifier
2724
{
2825
private AutoItLexer m_Lexer;
2926

30-
/// <summary>
31-
/// Initializes a new instance of the <see cref="AutoItEditorClassifier"/> class.
32-
/// </summary>
33-
/// <param name="registry">Classification registry.</param>
3427
internal AutoItEditorClassifier(IClassificationTypeRegistryService registry)
3528
{
3629
m_Lexer = new AutoItLexer(registry);
@@ -45,28 +38,9 @@ private void LexerClassificationChanged(object sender, ClassificationChangedEven
4538
#region IClassifier
4639

4740
#pragma warning disable 67
48-
49-
/// <summary>
50-
/// An event that occurs when the classification of a span of text has changed.
51-
/// </summary>
52-
/// <remarks>
53-
/// This event gets raised if a non-text change would affect the classification in some way,
54-
/// for example typing /* would cause the classification to change in C# without directly
55-
/// affecting the span.
56-
/// </remarks>
5741
public event EventHandler<ClassificationChangedEventArgs> ClassificationChanged;
58-
5942
#pragma warning restore 67
6043

61-
/// <summary>
62-
/// Gets all the <see cref="ClassificationSpan"/> objects that intersect with the given range of text.
63-
/// </summary>
64-
/// <remarks>
65-
/// This method scans the given SnapshotSpan for potential matches for this classification.
66-
/// In this instance, it classifies everything and returns each span as a new ClassificationSpan.
67-
/// </remarks>
68-
/// <param name="span">The span currently being classified.</param>
69-
/// <returns>A list of ClassificationSpans that represent spans identified to be of this classification.</returns>
7044
public IList<ClassificationSpan> GetClassificationSpans(SnapshotSpan span)
7145
{
7246
return m_Lexer.Parse(span);

‎AutoItSyntaxHighlight/AutoItEditorClassifierClassificationDefinition.cs

-7
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,11 @@
1919

2020
namespace AutoItSyntaxHighlight
2121
{
22-
/// <summary>
23-
/// Classification type definition export for AutoItEditorClassifier
24-
/// </summary>
2522
internal static class AutoItEditorClassifierClassificationDefinition
2623
{
2724
// This disables "The field is never used" compiler's warning. Justification: the field is used by MEF.
2825
#pragma warning disable 169
2926
#pragma warning disable CS0414
30-
31-
/// <summary>
32-
/// Defines the "AutoItEditorClassifier" classification type.
33-
/// </summary>
3427
[Export(typeof(ClassificationTypeDefinition))]
3528
[Name("AutoItEditorClassifier")]
3629
private static ClassificationTypeDefinition typeDefinition = null;

‎AutoItSyntaxHighlight/AutoItEditorClassifierProvider.cs

-15
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,22 @@
2020

2121
namespace AutoItSyntaxHighlight
2222
{
23-
/// <summary>
24-
/// Classifier provider. It adds the classifier to the set of classifiers.
25-
/// </summary>
2623
[Export(typeof(IClassifierProvider))]
2724
[ContentType("au3")]
2825
internal class AutoItEditorClassifierProvider : IClassifierProvider
2926
{
3027
// Disable "Field is never assigned to..." compiler's warning. Justification: the field is assigned by MEF.
3128
#pragma warning disable 649
32-
33-
/// <summary>
34-
/// Classification registry to be used for getting a reference
35-
/// to the custom classification type later.
36-
/// </summary>
3729
[Import]
3830
private IClassificationTypeRegistryService classificationRegistry;
3931

4032
#pragma warning restore 649
4133

4234
#region IClassifierProvider
43-
44-
/// <summary>
45-
/// Gets a classifier for the given text buffer.
46-
/// </summary>
47-
/// <param name="buffer">The <see cref="ITextBuffer"/> to classify.</param>
48-
/// <returns>A classifier for the text buffer, or null if the provider cannot do so in its current state.</returns>
4935
public IClassifier GetClassifier(ITextBuffer buffer)
5036
{
5137
return buffer.Properties.GetOrCreateSingletonProperty<AutoItEditorClassifier>(creator: () => new AutoItEditorClassifier(this.classificationRegistry));
5238
}
53-
5439
#endregion
5540
}
5641
}

‎AutoItSyntaxHighlight/AutoItSyntaxHighlight.csproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.props')" />
3+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" />
44
<PropertyGroup>
55
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
66
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -85,25 +85,25 @@
8585
<Reference Include="Microsoft.Build.Framework" />
8686
<Reference Include="Microsoft.CSharp" />
8787
<Reference Include="Microsoft.VisualStudio.CoreUtility, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
88-
<HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.14.2.25123\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
88+
<HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
8989
<Private>True</Private>
9090
</Reference>
9191
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
9292
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
9393
<Reference Include="Microsoft.VisualStudio.Text.Data, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94-
<HintPath>..\packages\Microsoft.VisualStudio.Text.Data.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
94+
<HintPath>..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
9595
<Private>True</Private>
9696
</Reference>
9797
<Reference Include="Microsoft.VisualStudio.Text.Logic, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98-
<HintPath>..\packages\Microsoft.VisualStudio.Text.Logic.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
98+
<HintPath>..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
9999
<Private>True</Private>
100100
</Reference>
101101
<Reference Include="Microsoft.VisualStudio.Text.UI, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102-
<HintPath>..\packages\Microsoft.VisualStudio.Text.UI.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
102+
<HintPath>..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
103103
<Private>True</Private>
104104
</Reference>
105105
<Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
106-
<HintPath>..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.2.25123\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
106+
<HintPath>..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
107107
<Private>True</Private>
108108
</Reference>
109109
<Reference Include="PresentationCore" />
@@ -123,10 +123,10 @@
123123
<PropertyGroup>
124124
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
125125
</PropertyGroup>
126-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.props'))" />
127-
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.targets'))" />
126+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props'))" />
127+
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets'))" />
128128
</Target>
129-
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.2.25123\build\Microsoft.VSSDK.BuildTools.targets')" />
129+
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" />
130130
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
131131
Other similar extension points exist, see Microsoft.Common.targets.
132132
<Target Name="BeforeBuild">

‎AutoItSyntaxHighlight/ClassificationFormats/AutoItEditorClassifierFormat.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ namespace AutoItSyntaxHighlight.ClassificationFormats
2222
[Export(typeof(EditorFormatDefinition))]
2323
[ClassificationType(ClassificationTypeNames = "AutoItEditorClassifier")]
2424
[Name("AutoItEditorClassifier")]
25-
[UserVisible(false)] // This should be visible to the end user
26-
[Order(Before = Priority.Default)] // Set the priority to be after the default classifiers
25+
[UserVisible(false)]
26+
[Order(Before = Priority.Default)]
2727
internal sealed class AutoItEditorClassifierFormat : ClassificationFormatDefinition
2828
{
2929
public AutoItEditorClassifierFormat()
3030
{
31-
this.DisplayName = "AutoItEditorClassifier"; // Human readable version of the name
31+
this.DisplayName = "AutoItEditorClassifier";
3232
}
3333
}
3434
}

‎AutoItSyntaxHighlight/ClassificationFormats/AutoItEditorCommentClassifierFormat.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal sealed class AutoItEditorCommentClassifierFormat : ClassificationFormat
3030
{
3131
public AutoItEditorCommentClassifierFormat()
3232
{
33-
this.DisplayName = "AutoIt comments"; // Human readable version of the name
33+
this.DisplayName = "AutoIt comments";
3434
var color = VSColorTheme.GetThemedColor(EnvironmentColors.ToolWindowBackgroundBrushKey);
3535
if(color.R == 37 && color.G == 37 && color.B == 38)
3636
{

‎AutoItSyntaxHighlight/ClassificationFormats/AutoItEditorFunctionsClassifierFormat.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ namespace AutoItSyntaxHighlight.ClassificationFormats
2424
[Export(typeof(EditorFormatDefinition))]
2525
[ClassificationType(ClassificationTypeNames = "AutoItEditorFunctionsClassifier")]
2626
[Name("AutoItEditorFunctionsClassifier")]
27-
[UserVisible(true)] // This should be visible to the end user
28-
[Order(Before = Priority.Default)] // Set the priority to be after the default classifiers
27+
[UserVisible(true)]
28+
[Order(Before = Priority.Default)]
2929
internal sealed class AutoItEditorFunctionsClassifierFormat : ClassificationFormatDefinition
3030
{
3131
public AutoItEditorFunctionsClassifierFormat()
3232
{
33-
this.DisplayName = "AutoIt functions"; // Human readable version of the name
33+
this.DisplayName = "AutoIt functions";
3434
var color = VSColorTheme.GetThemedColor(EnvironmentColors.ToolWindowBackgroundBrushKey);
3535
if (color.R == 37 && color.G == 37 && color.B == 38)
3636
{

‎AutoItSyntaxHighlight/ClassificationFormats/AutoItEditorKeywordClassifierFormat.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ namespace AutoItSyntaxHighlight.ClassificationFormats
2424
[Export(typeof(EditorFormatDefinition))]
2525
[ClassificationType(ClassificationTypeNames = "AutoItEditorKeywordClassifier")]
2626
[Name("AutoItEditorKeywordClassifier")]
27-
[UserVisible(true)] // This should be visible to the end user
28-
[Order(Before = Priority.Default)] // Set the priority to be after the default classifiers
27+
[UserVisible(true)]
28+
[Order(Before = Priority.Default)]
2929
internal sealed class AutoItEditorKeywordClassifierFormat : ClassificationFormatDefinition
3030
{
3131
public AutoItEditorKeywordClassifierFormat()
3232
{
33-
this.DisplayName = "AutoIt keywords"; // Human readable version of the name
33+
this.DisplayName = "AutoIt keywords";
3434
var color = VSColorTheme.GetThemedColor(EnvironmentColors.ToolWindowBackgroundBrushKey);
3535
if (color.R == 37 && color.G == 37 && color.B == 38)
3636
{

‎AutoItSyntaxHighlight/ClassificationFormats/AutoItEditorStringClassifierFormat.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ namespace AutoItSyntaxHighlight.ClassificationFormats
2424
[Export(typeof(EditorFormatDefinition))]
2525
[ClassificationType(ClassificationTypeNames = "AutoItEditorStringClassifier")]
2626
[Name("AutoItEditorStringClassifier")]
27-
[UserVisible(true)] // This should be visible to the end user
28-
[Order(Before = Priority.Default)] // Set the priority to be after the default classifiers
27+
[UserVisible(true)]
28+
[Order(Before = Priority.Default)]
2929
internal sealed class AutoItEditorStringClassifierFormat : ClassificationFormatDefinition
3030
{
3131
public AutoItEditorStringClassifierFormat()
3232
{
33-
this.DisplayName = "AutoIt strings"; // Human readable version of the name
33+
this.DisplayName = "AutoIt strings";
3434
var color = VSColorTheme.GetThemedColor(EnvironmentColors.ToolWindowBackgroundBrushKey);
3535
if (color.R == 37 && color.G == 37 && color.B == 38)
3636
{

‎AutoItSyntaxHighlight/packages.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.VisualStudio.CoreUtility" version="14.2.25123" targetFramework="net452" />
4-
<package id="Microsoft.VisualStudio.Text.Data" version="14.2.25123" targetFramework="net452" />
5-
<package id="Microsoft.VisualStudio.Text.Logic" version="14.2.25123" targetFramework="net452" />
6-
<package id="Microsoft.VisualStudio.Text.UI" version="14.2.25123" targetFramework="net452" />
7-
<package id="Microsoft.VisualStudio.Text.UI.Wpf" version="14.2.25123" targetFramework="net452" />
8-
<package id="Microsoft.VSSDK.BuildTools" version="14.2.25123" targetFramework="net452" developmentDependency="true" />
3+
<package id="Microsoft.VisualStudio.CoreUtility" version="14.3.25407" targetFramework="net452" />
4+
<package id="Microsoft.VisualStudio.Text.Data" version="14.3.25407" targetFramework="net452" />
5+
<package id="Microsoft.VisualStudio.Text.Logic" version="14.3.25407" targetFramework="net452" />
6+
<package id="Microsoft.VisualStudio.Text.UI" version="14.3.25407" targetFramework="net452" />
7+
<package id="Microsoft.VisualStudio.Text.UI.Wpf" version="14.3.25407" targetFramework="net452" />
8+
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25407" targetFramework="net452" developmentDependency="true" />
99
</packages>

‎AutoItSyntaxHighlight/source.extension.vsixmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="f0d099a8-5c0d-4414-82c7-ef78c396578b" Version="1.0.0.5" Language="en-US" Publisher="David Roller" />
4+
<Identity Id="f0d099a8-5c0d-4414-82c7-ef78c396578b" Version="1.0.0.6" Language="en-US" Publisher="David Roller" />
55
<DisplayName>AutoItSyntaxHighlight</DisplayName>
66
<Description xml:space="preserve">AutoIt scripting language support for Visual Studio</Description>
77
<License>LICENSE</License>

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,9 @@ on the official Visual Studio extension gallery.
4545
**2016-06-05**
4646

4747
- [x] Fix bug that semicolons in strings are detected as comment start
48+
49+
## 1.0.0.6
50+
51+
**2016-06-24**
52+
53+
- [x] Minor changes and refactorings

0 commit comments

Comments
 (0)