Cleanup and simplification

[release]

src/Language/BraceCompletion.cs → src/Language/BasicLanguageFeatures.cs

@@ -1,5 +1,6 @@
-using System.ComponentModel.Composition;
-using BaseClasses;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
 using Microsoft.VisualStudio.Text.BraceCompletion;
 using Microsoft.VisualStudio.Text.Tagging;
 using Microsoft.VisualStudio.Utilities;
@@ -29,4 +30,20 @@ internal sealed class BraceMatchingTaggerProvider : BraceMatchingBase
         // This will match parenthesis, curly brackets, and square brackets by default.
         // Override the BraceList property to modify the list of braces to match.
     }
+
+    [Export(typeof(IAsyncCompletionCommitManagerProvider))]
+    [ContentType(Constants.LanguageName)]
+    [Name(Constants.LanguageName)]
+    internal sealed class CompletionCommitManager : CompletionCommitManagerBase
+    {
+        public override IEnumerable<char> CommitChars => new char[] { ' ', '\'', '"', ',', '.', ';', ':' };
+    }
+
+    [Export(typeof(IViewTaggerProvider))]
+    [ContentType(Constants.LanguageName)]
+    [TagType(typeof(TextMarkerTag))]
+    public class SameWordHighlighter : SameWordHighlighterBase
+    {
+        // This is a default implementation of same word highlighting
+    }
 }

src/Language/ClassificationTagger.cs

@@ -24,7 +24,7 @@ public ITagger<T> CreateTagger<T>(ITextBuffer buffer) where T : ITag
         }
     }
 
-    internal class ClassificationTagger : LexTaggerConsumerBase<IClassificationTag, LexTag>
+    internal class ClassificationTagger : LexTaggerConsumerBase<IClassificationTag>
     {
         private static Dictionary<ItemType, ClassificationTag> _map;
 

src/Language/ErrorListManager.cs

@@ -92,7 +92,6 @@ private IEnumerable<ErrorListItem> CreateErrorListItem(ParseItem item)
         protected override void Closed(IWpfTextView textView)
         {
             _document.Processed -= ParseErrors;
-            _document.Dispose();
             _dataSource.CleanAllErrors();
         }
     }

src/Language/ErrorTagger.cs

@@ -22,7 +22,7 @@ public ITagger<T> CreateTagger<T>(ITextBuffer buffer) where T : ITag
         }
     }
 
-    public class ErrorTagger : LexTaggerConsumerBase<IErrorTag, LexTag>
+    public class ErrorTagger : LexTaggerConsumerBase<IErrorTag>
     {
         public ErrorTagger(ITagAggregator<LexTag> lexTags) : base(lexTags)
         { }

src/Language/LexTagger.cs

@@ -64,7 +64,7 @@ private void ReParse(object sender = null, EventArgs e = null)
                 SnapshotSpan span = new(_buffer.CurrentSnapshot, 0, _buffer.CurrentSnapshot.Length);
                 TagsChanged?.Invoke(this, new SnapshotSpanEventArgs(span));
 
-            }, VsTaskRunContext.UIThreadBackgroundPriority);
+            }, VsTaskRunContext.UIThreadIdlePriority);
         }
 
         private void AddTagToList(Dictionary<ParseItem, ITagSpan<LexTag>> list, ParseItem item)
@@ -79,6 +79,7 @@ public void Dispose()
             if (!_isDisposed)
             {
                 _document.Processed -= ReParse;
+                _document.Dispose();
             }
 
             _isDisposed = true;

src/Language/LexTaggerConsumerBase.cs

@@ -5,12 +5,12 @@
 
 namespace PkgdefLanguage
 {
-    public abstract class LexTaggerConsumerBase<TTag, TLexTag> : ITagger<TTag>, IDisposable where TTag : ITag where TLexTag : ITag
+    public abstract class LexTaggerConsumerBase<TTag> : ITagger<TTag>, IDisposable where TTag : ITag
     {
-        private readonly ITagAggregator<TLexTag> _lexTags;
+        private readonly ITagAggregator<LexTag> _lexTags;
         private bool _isDisposed;
 
-        public LexTaggerConsumerBase(ITagAggregator<TLexTag> lexTags)
+        public LexTaggerConsumerBase(ITagAggregator<LexTag> lexTags)
         {
             _lexTags = lexTags;
             _lexTags.TagsChanged += LexTagsChanged;
@@ -28,15 +28,15 @@ public IEnumerable<ITagSpan<TTag>> GetTags(NormalizedSnapshotSpanCollection span
         {
             List<ITagSpan<TTag>> list = new();
 
-            foreach (IMappingTagSpan<TLexTag> tagSpan in _lexTags.GetTags(spans))
+            foreach (IMappingTagSpan<LexTag> tagSpan in _lexTags.GetTags(spans))
             {
                 list.AddRange(GetTags(tagSpan));
             }
 
             return list;
         }
 
-        public abstract IEnumerable<ITagSpan<TTag>> GetTags(IMappingTagSpan<TLexTag> span);
+        public abstract IEnumerable<ITagSpan<TTag>> GetTags(IMappingTagSpan<LexTag> span);
 
         public void Dispose()
         {

src/Language/SameWordHighlighter.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel.Composition;
+using Microsoft.VisualStudio.Text.Tagging;
+using Microsoft.VisualStudio.Utilities;
+
+namespace PkgdefLanguage
+{
+    [Export(typeof(IViewTaggerProvider))]
+    [ContentType(Constants.LanguageName)]
+    [TagType(typeof(TextMarkerTag))]
+    public class SameWordHighlighter : SameWordHighlighterBase
+    {
+
+    }
+}

src/Language/StructureTagger.cs

@@ -22,7 +22,7 @@ public ITagger<T> CreateTagger<T>(ITextBuffer buffer) where T : ITag
         }
     }
 
-    public class StructureTagger : LexTaggerConsumerBase<IStructureTag, LexTag>
+    public class StructureTagger : LexTaggerConsumerBase<IStructureTag>
     {
         public StructureTagger(ITagAggregator<LexTag> lexTags) : base(lexTags)
         { }

src/PkgdefDocument.cs

@@ -45,8 +45,9 @@ public void Dispose()
             if (!_isDisposed)
             {
                 _buffer.Changed -= BufferChanged;
-                _isDisposed = true;
             }
+
+            _isDisposed = true;
         }
     }
 

src/PkgdefLanguage.csproj

@@ -6,13 +6,9 @@
     <TargetFrameworkProfile />
     <LangVersion>10</LangVersion>
     <UseCodebase>true</UseCodebase>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -74,7 +70,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Community.VisualStudio.Toolkit.16" ExcludeAssets="runtime">
-      <Version>16.0.357</Version>
+      <Version>16.0.359</Version>
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
@@ -94,9 +90,8 @@
     <Compile Include="Language\LexTagger.cs" />
     <Compile Include="Language\PredefinedVariables.cs" />
     <Compile Include="Language\ErrorListManager.cs" />
-    <Compile Include="Language\BraceCompletion.cs" />
+    <Compile Include="Language\BasicLanguageFeatures.cs" />
     <Compile Include="Language\ClassificationTagger.cs" />
-    <Compile Include="Language\CompletionCommitManager.cs" />
     <Compile Include="Language\CompletionSource.cs" />
     <Compile Include="Language\ErrorTagger.cs" />
     <Compile Include="Language\Language.cs" />

test/PkgdefLanguage.Test.csproj

@@ -7,7 +7,7 @@
       <Compile Remove="C:\Users\madsk\.nuget\packages\community.visualstudio.toolkit.16\16.0.357\build\AssemblyInfo.cs" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Community.VisualStudio.Toolkit.16" Version="16.0.357" />
+        <PackageReference Include="Community.VisualStudio.Toolkit.16" Version="16.0.359" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
         <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />