Added user rating prompt

[release]
madskristensen · Jan 25, 2022 · a0d60d2 · a0d60d2
1 parent b850f57
commit a0d60d2
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -39,19 +39,19 @@ jobs:
         vsix-token-source-file: ${{ env.VsixManifestSourcePath }}
 
     - name: Build
-      run: msbuild /v:m -restore /p:OutDir=../_built
+      run: msbuild /v:m -restore /p:OutDir=\_built
 
     - name: Setup test
       uses: darenm/Setup-VSTest@v1
 
     - name: Test
-      run: vstest.console.exe _built\*test.dll
+      run: vstest.console.exe \_built\*test.dll
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: ${{ github.event.repository.name }}.vsix
-        path: _built/**/*.vsix
+        path: /_built/**/*.vsix
 
   publish:
     if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}

diff --git a/src/Constants.cs b/src/Constants.cs
@@ -6,5 +6,7 @@ public class Constants
         public static string[] CommentChars = new[] { ";", "//" };
         public const string PkgDefExt = ".pkgdef";
         public const string PkgUndefExt = ".pkgundef";
+
+        public const string MarketplaceId = "MadsKristensen.PkgdefLanguage";
     }
 }
diff --git a/src/Editor/EditorFeatures.cs b/src/Editor/EditorFeatures.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
 using Microsoft.VisualStudio.Language.StandardClassification;
 using Microsoft.VisualStudio.Text.BraceCompletion;
+using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
 using Microsoft.VisualStudio.Utilities;
 
@@ -75,4 +77,27 @@ internal sealed class BraceMatchingTaggerProvider : BraceMatchingBase
     [TagType(typeof(TextMarkerTag))]
     public class SameWordHighlighter : SameWordHighlighterBase
     { }
+
+    [Export(typeof(IWpfTextViewCreationListener))]
+    [ContentType(Constants.LanguageName)]
+    [TextViewRole(PredefinedTextViewRoles.PrimaryDocument)]
+    public class UserRatings : WpfTextViewCreationListener
+    {
+        private DateTime _openedDate;
+        private RatingPrompt _rating;
+
+        protected override void Created(DocumentView docView)
+        {
+            _openedDate = DateTime.Now;
+            _rating = new RatingPrompt(Constants.MarketplaceId, Vsix.Name, AdvancedOptions.Instance, 5);
+        }
+
+        protected override void Closed(IWpfTextView textView)
+        {
+            if (_openedDate.AddMinutes(2) < DateTime.Now)
+            {
+                _rating.RegisterSuccessfulUsage();
+            }
+        }
+    }
 }
diff --git a/src/Editor/TokenTagger.cs b/src/Editor/TokenTagger.cs
@@ -51,19 +51,19 @@ public override Task TokenizeAsync()
                     return Task.CompletedTask;
                 }
 
-                AddTagToList(list, item);
+                ConvertItemToTag(list, item);
 
                 foreach (ParseItem variable in item.References)
                 {
-                    AddTagToList(list, variable);
+                    ConvertItemToTag(list, variable);
                 }
             }
 
             OnTagsUpdated(list);
             return Task.CompletedTask;
         }
 
-        private void AddTagToList(List<ITagSpan<TokenTag>> list, ParseItem item)
+        private void ConvertItemToTag(List<ITagSpan<TokenTag>> list, ParseItem item)
         {
             var hasTooltip = !item.IsValid;
             var supportsOutlining = item is Entry entry && entry.Properties.Any();

diff --git a/src/Options/AdvancedOptions.cs b/src/Options/AdvancedOptions.cs
@@ -0,0 +1,17 @@
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+
+namespace PkgdefLanguage
+{
+    internal partial class OptionsProvider
+    {
+        [ComVisible(true)]
+        public class AdvancedOptionsPage : BaseOptionPage<AdvancedOptions> { }
+    }
+
+    public class AdvancedOptions : BaseOptionModel<AdvancedOptions>, IRatingConfig
+    {
+        [Browsable(false)]
+        public int RatingRequests { get; set; }
+    }
+}
diff --git a/src/Parser/Document.cs b/src/Parser/Document.cs
@@ -27,13 +27,11 @@ public Document(ITextBuffer buffer)
             _buffer.Changed += BufferChanged;
             FileName = buffer.GetFileName();
 
-#pragma warning disable VSTHRD104 // Offer async methods
             ThreadHelper.JoinableTaskFactory.Run(async () =>
             {
                 Project project = await VS.Solutions.GetActiveProjectAsync();
                 ProjectName = project?.Name;
             });
-#pragma warning restore VSTHRD104 // Offer async methods
         }
 
         public bool IsProcessing { get; private set; }

diff --git a/src/PkgdefLanguage.csproj b/src/PkgdefLanguage.csproj
@@ -8,7 +8,9 @@
     <UseCodebase>true</UseCodebase>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <NoWarn>MSB3277</NoWarn>
+    <NoWarn>VSTHRD104</NoWarn>
     <DisableWarning>MSB3277</DisableWarning>
+    <DisableWarning>VSTHRD104</DisableWarning>
   </PropertyGroup>
   <PropertyGroup>
   </PropertyGroup>
@@ -70,7 +72,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Community.VisualStudio.Toolkit.16" version="16.0.394" ExcludeAssets="runtime">
+    <PackageReference Include="Community.VisualStudio.Toolkit.16" version="16.0.408" ExcludeAssets="runtime">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
@@ -82,6 +84,7 @@
   <ItemGroup>
     <Compile Include="Commands\Formatting.cs" />
     <Compile Include="Editor\DropdownBars.cs" />
+    <Compile Include="Options\AdvancedOptions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Commands\Commenting.cs" />
     <Compile Include="Constants.cs" />

diff --git a/src/PkgdefPackage.cs b/src/PkgdefPackage.cs
@@ -14,6 +14,7 @@ namespace PkgdefLanguage
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     [Guid(PackageGuids.PkgdefLanguageString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
+    [ProvideOptionPage(typeof(OptionsProvider.AdvancedOptionsPage), "PkgdefLanguage", "Advanced", 0, 0, true, SupportsProfiles = true, NoShowAllView = true)]
 
     [ProvideLanguageService(typeof(LanguageFactory), Constants.LanguageName, 0, EnableLineNumbers = true, EnableAsyncCompletion = true, ShowCompletion = true, EnableFormatSelection = false, ShowDropDownOptions = true)]
     [ProvideLanguageExtension(typeof(LanguageFactory), Constants.PkgDefExt)]

diff --git a/test/PkgdefLanguage.Test.csproj b/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.394" />
+        <PackageReference Include="Community.VisualStudio.Toolkit.16" Version="16.0.408" />
         <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" />