Rev version to 1.0, remove alpha flag (#528)

* Rev version to 1.0, remove alpha flag

* Improve VS option description clarity

* Simplify pipeline triggers

* Adds Is Fixable to DevSkimRuleProcession to Ensure fixes are applicable before returning via analyze command

* Remove extra usings

* Clean up

---------

Co-authored-by: David Alcantar <50344095+daalcant@users.noreply.github.com>

Author: gfs

DevSkim-DotNet/Microsoft.DevSkim.CLI/Commands/AnalyzeCommand.cs

@@ -445,14 +445,14 @@ void parseFileEntry(FileEntry fileEntry)
                                                         issue.Rule.Id,
                                                         issue.Rule.Severity,
                                                         issue.Rule.Name);
-
+                                var issueText = fileText.Substring(issue.Boundary.Index, issue.Boundary.Length);
                                 IssueRecord record = new DevSkim.IssueRecord(
                                     Filename: TryRelativizePath(_opts.BasePath, fileEntry.FullPath),
                                     Filesize: fileText.Length,
-                                    TextSample: _opts.SkipExcerpts ? string.Empty : fileText.Substring(issue.Boundary.Index, issue.Boundary.Length),
+                                    TextSample: _opts.SkipExcerpts ? string.Empty : issueText,
                                     Issue: issue,
                                     Language: languageInfo.Name,
-                                    Fixes: issue.Rule.Fixes);
+                                    Fixes: issue.Rule.Fixes?.Where(x => DevSkimRuleProcessor.IsFixable(issueText, x)).ToList());
 
                                 outputWriter.WriteIssue(record);
                             }

DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/TextDocumentSyncHandler.cs

@@ -69,9 +69,10 @@ private async Task<Unit> GenerateDiagnosticsForTextDocumentAsync(string text, in
                     for (int i = 0; i < issue.Rule.Fixes?.Count; i++)
                     {
                         CodeFix fix = issue.Rule.Fixes[i];
-                        if (fix.Replacement is not null)
+                        var targetText = text.Substring(issue.Boundary.Index, issue.Boundary.Length);
+                        if (fix.Replacement is not null && DevSkimRuleProcessor.IsFixable(targetText, fix))
                         {
-                            string potentialFix = DevSkimRuleProcessor.Fix(text.Substring(issue.Boundary.Index, issue.Boundary.Length), fix);
+                            string potentialFix = DevSkimRuleProcessor.Fix(targetText, fix);
                             codeFixes.Add(new CodeFixMapping(diag, potentialFix, uri.ToUri(), $"Replace with {potentialFix}", version, issue.Boundary.Index, issue.Boundary.Index + issue.Boundary.Length, false));
                         }
                     }

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/ContentTypes.cs

@@ -6,17 +6,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.IO.Pipes;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.Threading;
-using Newtonsoft.Json.Linq;
 using Task = System.Threading.Tasks.Task;
-using Microsoft.VisualStudio.LanguageServer.Protocol;
 using System.ComponentModel.Composition;
 using Microsoft.Build.Framework.XamlTypes;
-using Microsoft.DevSkim.LanguageProtoInterop;
 using Microsoft.DevSkim.VisualStudio.ProcessTracker;
 using Microsoft.DevSkim.VisualStudio;
 

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/DevSkimLanguageClient.cs

@@ -3,10 +3,7 @@
 using Microsoft.VisualStudio.Imaging.Interop;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
-using System;
-using System.Collections.Generic;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
@@ -16,8 +13,6 @@ namespace Microsoft.DevSkim.VisualStudio
     using Microsoft.DevSkim.LanguageProtoInterop;
     using System;
     using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
     using System.Threading.Tasks;
 
     internal class DevSkimSuggestedAction: ISuggestedAction
@@ -78,7 +73,7 @@ public void Dispose()
 
         public Task<IEnumerable<SuggestedActionSet>> GetActionSetsAsync(CancellationToken cancellationToken)
         {
-            return null;
+            return Task.FromResult<IEnumerable<SuggestedActionSet>>(Array.Empty<SuggestedActionSet>());
         }
 
         public Task<object> GetPreviewAsync(CancellationToken cancellationToken)

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/DevSkimSuggestedAction.cs

@@ -48,7 +48,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ContentTypes.cs" />
     <Compile Include="DevSkimFixMessageTarget.cs" />
     <Compile Include="DevSkimLanguageClient.cs" />
     <Compile Include="DevSkimSuggestedAction.cs" />

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/Microsoft.DevSkim.VisualStudio.csproj

@@ -5,11 +5,8 @@ namespace Microsoft.DevSkim.VisualStudio.Options
     using Microsoft.Build.Framework.XamlTypes;
     using Microsoft.VisualStudio.Shell;
     using System;
-    using System.Collections.Generic;
     using System.ComponentModel;
-    using System.ComponentModel.Design;
     using System.Drawing;
-    using System.Drawing.Design;
     using System.Runtime.InteropServices;
     using System.Windows.Forms;
     // When adding any property here, be sure to add it to IDevSkimOptions as well
@@ -147,13 +144,13 @@ protected override IWin32Window Window
         /// Ignore Options
         /// </summary>
         [Category(IgnoresCategory)]
-        [DisplayName("Ignore Files")]
-        [Description("Specify glob expression patterns to exclude files and folders which match from analysis.")]
+        [DisplayName("Ignore Files by Globs")]
+        [Description("Comma separated glob expression patterns to exclude files and folders which match from analysis.")]
         public string IgnoreFilesString { get; set; } = string.Empty;
 
         [Category(IgnoresCategory)]
-        [DisplayName("Ignore Rules List")]
-        [Description("Exact string identity of DevSkim Rule IDs to ignore.")]
+        [DisplayName("Ignore Rules by Id")]
+        [Description("Comma separated list of exact string identity of DevSkim Rule IDs to ignore.")]
         public string IgnoreRulesListString { get; set; } = string.Empty;
 
         [Category(IgnoresCategory)]

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/Options/GeneralOptionsPage.cs

@@ -1,19 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 using MediatR;
 using Microsoft.DevSkim.LanguageProtoInterop;
-using Microsoft.VisualStudio.ComponentModelHost;
-using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
 using StreamJsonRpc;
 
 namespace Microsoft.DevSkim.VisualStudio

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/SettingsChangedNotifier.cs

@@ -4,9 +4,6 @@
     using System;
     using System.Collections.Concurrent;
     using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
-    using System.Threading.Tasks;
 
     internal static class StaticData
     {

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/StaticData.cs

@@ -14,7 +14,7 @@ internal class SuggestedActionsSourceProvider : ISuggestedActionsSourceProvider
     {
         public ISuggestedActionsSource CreateSuggestedActionsSource(ITextView textView, ITextBuffer textBuffer)
         {
-            if (textBuffer == null && textView == null)
+            if (textBuffer == null || textView == null)
             {
                 return null;
             }

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/SuggestedActionsSourceProvider.cs

@@ -1,19 +1,15 @@
 // Copyright (C) Microsoft. All rights reserved. Licensed under the MIT License.
 
 using Microsoft.DevSkim.LanguageProtoInterop;
-using Microsoft.Internal.VisualStudio.PlatformUI;
-using Microsoft.VisualStudio.Experimentation;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Operations;
-using Microsoft.VisualStudio.TextManager.Interop;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Documents;
 
 namespace Microsoft.DevSkim.VisualStudio
 {
@@ -76,10 +72,6 @@ private bool Intersects(CodeFixMapping codeFixMapping, TextExtent wordExtent)
             return false;
         }
 
-        // Map FileName to Mapping of FileVersion to Potential fixes
-        // This should come from DevSkimFixMessageTarget or StaticScannerSettings
-        private Dictionary<string, Dictionary<int, HashSet<CodeFixMapping>>> _bucket_o_suggestions = new Dictionary<string, Dictionary<int, HashSet<CodeFixMapping>>>();
-
         public Task<bool> HasSuggestedActionsAsync(ISuggestedActionCategorySet requestedActionCategories, SnapshotSpan range, CancellationToken cancellationToken)
         {
             return Task.Factory.StartNew(() =>

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/SuggestionActionsSource.cs

@@ -2,7 +2,6 @@
 {
     using Microsoft;
     using System;
-    using System.Collections.Generic;
     using Microsoft.DevSkim.LanguageProtoInterop;
     using Microsoft.DevSkim.VisualStudio.Options;
     using System.Linq;

DevSkim-DotNet/Microsoft.DevSkim.VisualStudio/VisualStudioSettingsManager.cs

@@ -95,6 +95,28 @@ public static string Fix(string text, CodeFix fixRecord)
             return result;
         }
 
+        /// <summary>
+        ///     Checks if the target source can be fixed with the provided fix
+        /// </summary>
+        /// <param name="text"> Source code line </param>
+        /// <param name="fixRecord"> Fix record to be applied </param>
+        /// <returns> Fixed source code line </returns>
+        public static bool IsFixable(string text, CodeFix fixRecord)
+        {
+            if (fixRecord?.FixType is { } fr && fr == FixType.RegexReplace)
+            {
+                if (fixRecord.Pattern is { })
+                {
+                    Regex regex = new Regex(fixRecord.Pattern.Pattern ?? string.Empty);
+                    return regex.IsMatch(text);
+                }
+            }
+
+            return false;
+        }
+
+
+
         /// <summary>
         ///     Generate appropriate suppression with comment style based on the filename
         /// </summary>

DevSkim-DotNet/Microsoft.DevSkim/DevSkimRuleProcessor.cs

@@ -7,10 +7,6 @@ trigger:
   branches:
     include:
     - main
-  paths:
-    include:
-    - DevSkim-DotNet
-    - rules
 pr: none
 
 resources:

Pipelines/cli/devskim-cli-release.yml

@@ -7,12 +7,6 @@ pr:
   branches:
     include:
     - main
-  paths:
-    include:
-    - Pipelines/vs/devskim-visualstudio-pr.yml
-    - DevSkim-DotNet/Microsoft.DevSkim
-    - DevSkim-DotNet/Microsoft.DevSkim.VisualStudio
-    - rules
 
 resources:
   repositories:

Pipelines/vs/devskim-visualstudio-pr.yml

@@ -7,11 +7,6 @@ trigger:
   branches:
     include:
     - main
-  paths:
-    include:
-    - DevSkim-DotNet/Microsoft.DevSkim
-    - DevSkim-DotNet/Microsoft.DevSkim.VisualStudio
-    - rules
 pr: none
 
 resources:

Pipelines/vs/devskim-visualstudio-release.yml

@@ -7,11 +7,6 @@ pr:
   branches:
     include:
     - main
-  paths:
-    include:
-    - Pipelines/vscode/devskim-vscode-pr.yml
-    - DevSkim-VSCode-Plugin
-    - rules
 
 resources:
   repositories:

Pipelines/vscode/devskim-vscode-pr.yml

@@ -7,10 +7,6 @@ trigger:
   branches:
     include:
     - main
-  paths:
-    include:
-    - DevSkim-VSCode-Plugin
-    - rules
 pr: none
 
 resources:

Pipelines/vscode/devskim-vscode-release.yml

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.8-alpha",
+  "version": "1.0",
   "publicReleaseRefSpec": [
     "^refs/heads/main$",
     "^refs/heads/v\\d+(?:\\.\\d+)?$"