simple fixes for remaining issues

vlada-shubina · vlada-shubina · commit ef75420d1816 · 2022-10-12T13:25:00.000+02:00
diff --git a/src/Microsoft.TemplateEngine.Core.Contracts/IRunSpec.cs b/src/Microsoft.TemplateEngine.Core.Contracts/IRunSpec.cs
@@ -9,7 +9,7 @@ public interface IRunSpec
     {
         string VariableFormatString { get; }
 
-        bool TryGetTargetRelPath(string sourceRelPath, out string targetRelPath);
+        bool TryGetTargetRelPath(string sourceRelPath, out string? targetRelPath);
 
         IReadOnlyList<IOperationProvider> GetOperations(IReadOnlyList<IOperationProvider> sourceOperations);
     }
diff --git a/src/Microsoft.TemplateEngine.Core.Contracts/PublicAPI.Shipped.txt b/src/Microsoft.TemplateEngine.Core.Contracts/PublicAPI.Shipped.txt
@@ -77,7 +77,6 @@ Microsoft.TemplateEngine.Core.Contracts.IProcessorState.Inject(System.IO.Stream!
 Microsoft.TemplateEngine.Core.Contracts.IReplacementTokens.OriginalValue.get -> Microsoft.TemplateEngine.Core.Contracts.ITokenConfig!
 Microsoft.TemplateEngine.Core.Contracts.IReplacementTokens.VariableName.get -> string!
 Microsoft.TemplateEngine.Core.Contracts.IRunSpec.GetOperations(System.Collections.Generic.IReadOnlyList<Microsoft.TemplateEngine.Core.Contracts.IOperationProvider!>! sourceOperations) -> System.Collections.Generic.IReadOnlyList<Microsoft.TemplateEngine.Core.Contracts.IOperationProvider!>!
-Microsoft.TemplateEngine.Core.Contracts.IRunSpec.TryGetTargetRelPath(string! sourceRelPath, out string! targetRelPath) -> bool
 Microsoft.TemplateEngine.Core.Contracts.IRunSpec.VariableFormatString.get -> string!
 Microsoft.TemplateEngine.Core.Contracts.IToken.Value.get -> byte[]!
 Microsoft.TemplateEngine.Core.Contracts.ITokenConfig.After.get -> string!
diff --git a/src/Microsoft.TemplateEngine.Core.Contracts/PublicAPI.Unshipped.txt b/src/Microsoft.TemplateEngine.Core.Contracts/PublicAPI.Unshipped.txt
@@ -6,4 +6,5 @@ Microsoft.TemplateEngine.Core.Contracts.IProcessorState.SeekSourceForwardWhile(M
 Microsoft.TemplateEngine.Core.Contracts.IProcessorState.SeekTargetBackUntil(Microsoft.TemplateEngine.Core.Contracts.ITokenTrie! match, bool consumeToken = false) -> void
 Microsoft.TemplateEngine.Core.Contracts.IProcessorState.SeekTargetBackWhile(Microsoft.TemplateEngine.Core.Contracts.ITokenTrie! match) -> void
 Microsoft.TemplateEngine.Core.Contracts.IProcessorState.WriteToTarget(byte[]! buffer, int offset, int count) -> void
+Microsoft.TemplateEngine.Core.Contracts.IRunSpec.TryGetTargetRelPath(string! sourceRelPath, out string? targetRelPath) -> bool
 Microsoft.TemplateEngine.Core.Contracts.ITokenTrie.AddToken(Microsoft.TemplateEngine.Core.Contracts.IToken? token, int index) -> void
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ListGlobbingPatternMatcher.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ListGlobbingPatternMatcher.cs
@@ -11,7 +11,7 @@ internal class ListGlobbingPatternMatcher : IPathMatcher
     {
         private readonly IReadOnlyList<IPathMatcher> _pathMatchers;
 
-        private string _displayPattern;
+        private string? _displayPattern;
 
         internal ListGlobbingPatternMatcher(IList<string> patternList)
         {
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/BalancedNestingConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/BalancedNestingConfig.cs
@@ -21,11 +21,11 @@ internal class BalancedNestingConfig : IOperationConfig
         public IEnumerable<IOperationProvider> ConfigureFromJson(string configuration, IDirectory templateRoot)
         {
             JObject rawConfiguration = JObject.Parse(configuration);
-            string startToken = rawConfiguration.ToString("startToken");
-            string realEndToken = rawConfiguration.ToString("realEndToken");
-            string pseudoEndToken = rawConfiguration.ToString("pseudoEndToken");
-            string id = rawConfiguration.ToString("id");
-            string resetFlag = rawConfiguration.ToString("resetFlag");
+            string? startToken = rawConfiguration.ToString("startToken");
+            string? realEndToken = rawConfiguration.ToString("realEndToken");
+            string? pseudoEndToken = rawConfiguration.ToString("pseudoEndToken");
+            string? id = rawConfiguration.ToString("id");
+            string? resetFlag = rawConfiguration.ToString("resetFlag");
             bool onByDefault = rawConfiguration.ToBool("onByDefault");
 
             yield return new BalancedNesting(startToken.TokenConfig(), realEndToken.TokenConfig(), pseudoEndToken.TokenConfig(), id, resetFlag, onByDefault);
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalBlockCommentConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalBlockCommentConfig.cs
@@ -15,8 +15,8 @@ internal static class ConditionalBlockCommentConfig
     {
         internal static List<IOperationProvider> ConfigureFromJObject(JObject rawConfiguration)
         {
-            string startToken = rawConfiguration.ToString("startToken");
-            string endToken = rawConfiguration.ToString("endToken");
+            string? startToken = rawConfiguration.ToString("startToken");
+            string? endToken = rawConfiguration.ToString("endToken");
 
             if (string.IsNullOrWhiteSpace(startToken))
             {
@@ -27,7 +27,7 @@ internal static List<IOperationProvider> ConfigureFromJObject(JObject rawConfigu
                 throw new TemplateAuthoringException($"Template authoring error. EndToken must be defined", "EndToken");
             }
 
-            string pseudoEndToken = rawConfiguration.ToString("pseudoEndToken");
+            string? pseudoEndToken = rawConfiguration.ToString("pseudoEndToken");
 
             ConditionalKeywords keywords = ConditionalKeywords.FromJObject(rawConfiguration);
             ConditionalOperationOptions options = ConditionalOperationOptions.FromJObject(rawConfiguration);
@@ -47,11 +47,11 @@ internal static List<IOperationProvider> GenerateConditionalSetup(string startTo
             return GenerateConditionalSetup(startToken, endToken, new ConditionalKeywords(), new ConditionalOperationOptions());
         }
 
-        internal static List<IOperationProvider> GenerateConditionalSetup(string startToken, string endToken, ConditionalKeywords keywords, ConditionalOperationOptions options)
+        internal static List<IOperationProvider> GenerateConditionalSetup(string? startToken, string? endToken, ConditionalKeywords keywords, ConditionalOperationOptions options)
         {
-            string pseudoEndComment;
+            string? pseudoEndComment;
 
-            if (endToken.Length < 2)
+            if (endToken is null || endToken.Length < 2)
             {
                 // end comment must be at least two characters to have a programmatically determined pseudo-comment
                 pseudoEndComment = null;
@@ -65,12 +65,12 @@ internal static List<IOperationProvider> GenerateConditionalSetup(string startTo
             return GenerateConditionalSetup(startToken, endToken, pseudoEndComment, keywords, options);
         }
 
-        internal static List<IOperationProvider> GenerateConditionalSetup(string startToken, string endToken, string pseudoEndToken)
+        internal static List<IOperationProvider> GenerateConditionalSetup(string? startToken, string? endToken, string? pseudoEndToken)
         {
             return GenerateConditionalSetup(startToken, endToken, pseudoEndToken, new ConditionalKeywords(), new ConditionalOperationOptions());
         }
 
-        internal static List<IOperationProvider> GenerateConditionalSetup(string startToken, string endToken, string pseudoEndToken, ConditionalKeywords keywords, ConditionalOperationOptions options)
+        internal static List<IOperationProvider> GenerateConditionalSetup(string? startToken, string? endToken, string? pseudoEndToken, ConditionalKeywords keywords, ConditionalOperationOptions options)
         {
             ConditionEvaluator evaluator = EvaluatorSelector.Select(options.EvaluatorType);
 
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalConfig.cs
@@ -22,7 +22,7 @@ internal class ConditionalConfig : IOperationConfig
         public IEnumerable<IOperationProvider> ConfigureFromJson(string configuration, IDirectory templateRoot)
         {
             JObject rawConfiguration = JObject.Parse(configuration);
-            string commentStyle = rawConfiguration.ToString("style");
+            string? commentStyle = rawConfiguration.ToString("style");
             IEnumerable<IOperationProvider> operations = string.IsNullOrEmpty(commentStyle) || string.Equals(commentStyle, "custom", StringComparison.OrdinalIgnoreCase)
                 ? ConditionalCustomConfig.ConfigureFromJObject(rawConfiguration)
                 : string.Equals(commentStyle, "line", StringComparison.OrdinalIgnoreCase)
@@ -36,7 +36,7 @@ public IEnumerable<IOperationProvider> ConfigureFromJson(string configuration, I
             }
         }
 
-        internal static IReadOnlyList<IOperationProvider> ConditionalSetup(ConditionalType style, string evaluatorType, bool wholeLine, bool trimWhiteSpace, string id)
+        internal static IReadOnlyList<IOperationProvider> ConditionalSetup(ConditionalType style, string evaluatorType, bool wholeLine, bool trimWhiteSpace, string? id)
         {
             List<IOperationProvider> setup;
 
@@ -134,7 +134,7 @@ internal static List<IOperationProvider> MSBuildConditionalSetup(string evaluato
         }
 
         // Nice to have: Generalize this type of setup similarly to Line, Block, & Custom
-        internal static List<IOperationProvider> CStyleNoCommentsConditionalSetup(string evaluatorType, bool wholeLine, bool trimWhiteSpace, string id)
+        internal static List<IOperationProvider> CStyleNoCommentsConditionalSetup(string evaluatorType, bool wholeLine, bool trimWhiteSpace, string? id)
         {
             ConditionalKeywords defaultKeywords = new ConditionalKeywords();
 
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalCustomConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalCustomConfig.cs
@@ -21,12 +21,12 @@ internal static List<IOperationProvider> ConfigureFromJObject(JObject rawConfigu
             IReadOnlyList<string> actionableElseIfToken = rawConfiguration.ArrayAsStrings("actionableElseif");
             IReadOnlyList<string> actionsToken = rawConfiguration.ArrayAsStrings("actions");
             IReadOnlyList<string> endIfToken = rawConfiguration.ArrayAsStrings("endif");
-            string id = rawConfiguration.ToString("id");
+            string? id = rawConfiguration.ToString("id");
             bool trim = rawConfiguration.ToBool("trim");
             bool wholeLine = rawConfiguration.ToBool("wholeLine");
             bool onByDefault = rawConfiguration.ToBool("onByDefault");
 
-            string evaluatorName = rawConfiguration.ToString("evaluator");
+            string? evaluatorName = rawConfiguration.ToString("evaluator");
             ConditionEvaluator evaluator = EvaluatorSelector.Select(evaluatorName);
 
             ConditionalTokens tokenVariants = new ConditionalTokens
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalKeywords.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalKeywords.cs
@@ -38,31 +38,31 @@ internal ConditionalKeywords()
         internal static ConditionalKeywords FromJObject(JObject rawConfiguration)
         {
             ConditionalKeywords keywords = new ConditionalKeywords();
-            string ifKeyword = rawConfiguration.ToString("ifKeyword");
+            string? ifKeyword = rawConfiguration.ToString("ifKeyword");
             if (!string.IsNullOrWhiteSpace(ifKeyword))
             {
-                keywords.IfKeywords = new[] { ifKeyword };
+                keywords.IfKeywords = new[] { ifKeyword! };
             }
 
-            string elseIfKeyword = rawConfiguration.ToString("elseIfKeyword");
+            string? elseIfKeyword = rawConfiguration.ToString("elseIfKeyword");
             if (!string.IsNullOrWhiteSpace(elseIfKeyword))
             {
-                keywords.ElseIfKeywords = new[] { elseIfKeyword };
+                keywords.ElseIfKeywords = new[] { elseIfKeyword! };
             }
 
-            string elseKeyword = rawConfiguration.ToString("elseKeyword");
+            string? elseKeyword = rawConfiguration.ToString("elseKeyword");
             if (!string.IsNullOrWhiteSpace(elseKeyword))
             {
-                keywords.ElseKeywords = new[] { elseKeyword };
+                keywords.ElseKeywords = new[] { elseKeyword! };
             }
 
-            string endIfKeyword = rawConfiguration.ToString("endIfKeyword");
+            string? endIfKeyword = rawConfiguration.ToString("endIfKeyword");
             if (!string.IsNullOrWhiteSpace(endIfKeyword))
             {
-                keywords.EndIfKeywords = new[] { endIfKeyword };
+                keywords.EndIfKeywords = new[] { endIfKeyword! };
             }
 
-            string prefixString = rawConfiguration.ToString("keywordPrefix");
+            string? prefixString = rawConfiguration.ToString("keywordPrefix");
             if (prefixString != null)
             {
                 // Empty string is a valid value for keywordPrefix, null is not.
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalLineCommentConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalLineCommentConfig.cs
@@ -14,7 +14,7 @@ internal static class ConditionalLineCommentConfig
     {
         internal static List<IOperationProvider> ConfigureFromJObject(JObject rawConfiguration)
         {
-            string token = rawConfiguration.ToString("token");
+            string? token = rawConfiguration.ToString("token");
 
             if (string.IsNullOrWhiteSpace(token))
             {
@@ -33,7 +33,7 @@ internal static List<IOperationProvider> GenerateConditionalSetup(string token)
             return GenerateConditionalSetup(token, new ConditionalKeywords(), new ConditionalOperationOptions());
         }
 
-        internal static List<IOperationProvider> GenerateConditionalSetup(string token, ConditionalKeywords keywords, ConditionalOperationOptions options)
+        internal static List<IOperationProvider> GenerateConditionalSetup(string? token, ConditionalKeywords keywords, ConditionalOperationOptions options)
         {
             string uncommentOperationId = $"Uncomment (line): {token} -> ()";
             string reduceCommentOperationId = $"Reduce comment (line): ({token}{token}) -> ({token})";
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalOperationOptions.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalOperationOptions.cs
@@ -10,14 +10,12 @@ internal class ConditionalOperationOptions
         private const string DefaultEvaluatorType = "C++";
         private const bool DefaultWholeLine = true;
         private const bool DefaultTrimWhitespace = true;
-        private static readonly string DefaultId;
 
         internal ConditionalOperationOptions()
         {
             EvaluatorType = DefaultEvaluatorType;
             WholeLine = DefaultWholeLine;
             TrimWhitespace = DefaultTrimWhitespace;
-            Id = DefaultId;
         }
 
         internal string EvaluatorType { get; set; }
@@ -26,28 +24,28 @@ internal ConditionalOperationOptions()
 
         internal bool TrimWhitespace { get; set; }
 
-        internal string Id { get; set; }
+        internal string? Id { get; set; }
 
         internal bool OnByDefault { get; set; }
 
         internal static ConditionalOperationOptions FromJObject(JObject rawConfiguration)
         {
             ConditionalOperationOptions options = new ConditionalOperationOptions();
 
-            string evaluatorType = rawConfiguration.ToString("evaluator");
+            string? evaluatorType = rawConfiguration.ToString("evaluator");
             if (!string.IsNullOrWhiteSpace(evaluatorType))
             {
-                options.EvaluatorType = evaluatorType;
+                options.EvaluatorType = evaluatorType!;
             }
 
             options.TrimWhitespace = rawConfiguration.ToBool("trim", true);
             options.WholeLine = rawConfiguration.ToBool("wholeLine", true);
             options.OnByDefault = rawConfiguration.ToBool("onByDefault");
 
-            string id = rawConfiguration.ToString("id");
+            string? id = rawConfiguration.ToString("id");
             if (!string.IsNullOrWhiteSpace(id))
             {
-                options.Id = id;
+                options.Id = id!;
             }
 
             return options;
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/FlagsConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/FlagsConfig.cs
@@ -28,13 +28,13 @@ internal class FlagsConfig : IOperationConfig
         public IEnumerable<IOperationProvider> ConfigureFromJson(string configuration, IDirectory templateRoot)
         {
             JObject rawConfiguration = JObject.Parse(configuration);
-            string flag = rawConfiguration.ToString("name");
+            string? flag = rawConfiguration.ToString("name");
             string on = rawConfiguration.ToString("on") ?? string.Empty;
             string off = rawConfiguration.ToString("off") ?? string.Empty;
             string onNoEmit = rawConfiguration.ToString("onNoEmit") ?? string.Empty;
             string offNoEmit = rawConfiguration.ToString("offNoEmit") ?? string.Empty;
-            string defaultStr = rawConfiguration.ToString("default");
-            string id = rawConfiguration.ToString("id");
+            string? defaultStr = rawConfiguration.ToString("default");
+            string? id = rawConfiguration.ToString("id");
             bool onByDefault = rawConfiguration.ToBool("onByDefault");
             bool? @default = null;
 
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/IncludeConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/IncludeConfig.cs
@@ -22,12 +22,12 @@ internal class IncludeConfig : IOperationConfig
         public IEnumerable<IOperationProvider> ConfigureFromJson(string configuration, IDirectory templateRoot)
         {
             JObject rawConfiguration = JObject.Parse(configuration);
-            string startToken = rawConfiguration.ToString("start");
-            string endToken = rawConfiguration.ToString("end");
-            string id = rawConfiguration.ToString("id");
+            string? startToken = rawConfiguration.ToString("start");
+            string? endToken = rawConfiguration.ToString("end");
+            string? id = rawConfiguration.ToString("id");
             bool onByDefault = rawConfiguration.ToBool("onByDefault");
 
-            yield return new Include(startToken.TokenConfig(), endToken.TokenConfig(), x => templateRoot.FileInfo(x).OpenRead(), id, onByDefault);
+            yield return new Include(startToken.TokenConfig(), endToken.TokenConfig(), x => templateRoot.FileInfo(x)?.OpenRead(), id, onByDefault);
         }
     }
 }
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/RegionConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/RegionConfig.cs
@@ -21,9 +21,9 @@ internal class RegionConfig : IOperationConfig
         public IEnumerable<IOperationProvider> ConfigureFromJson(string configuration, IDirectory templateRoot)
         {
             JObject rawConfiguration = JObject.Parse(configuration);
-            string id = rawConfiguration.ToString("id");
-            string start = rawConfiguration.ToString("start");
-            string end = rawConfiguration.ToString("end");
+            string? id = rawConfiguration.ToString("id");
+            string? start = rawConfiguration.ToString("start");
+            string? end = rawConfiguration.ToString("end");
             bool include = rawConfiguration.ToBool("include");
             bool regionTrim = rawConfiguration.ToBool("trim");
             bool regionWholeLine = rawConfiguration.ToBool("wholeLine");
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/RunSpec.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/RunSpec.cs
@@ -10,15 +10,15 @@ internal class RunSpec : IRunSpec
     {
         private readonly IReadOnlyList<IOperationProvider> _overrides;
 
-        internal RunSpec(IReadOnlyList<IOperationProvider> operationOverrides, string variableFormatString)
+        internal RunSpec(IReadOnlyList<IOperationProvider> operationOverrides, string? variableFormatString)
         {
             _overrides = operationOverrides;
             VariableFormatString = variableFormatString ?? "{0}";
         }
 
         public string VariableFormatString { get; }
 
-        public bool TryGetTargetRelPath(string sourceRelPath, out string targetRelPath)
+        public bool TryGetTargetRelPath(string sourceRelPath, out string? targetRelPath)
         {
             targetRelPath = null;
             return false;

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public interface IRunSpec`
`9`	`9`	`{`
`10`	`10`	`string VariableFormatString { get; }`
`11`	`11`
`12`		`- bool TryGetTargetRelPath(string sourceRelPath, out string targetRelPath);`
	`12`	`+ bool TryGetTargetRelPath(string sourceRelPath, out string? targetRelPath);`
`13`	`13`
`14`	`14`	`IReadOnlyList<IOperationProvider> GetOperations(IReadOnlyList<IOperationProvider> sourceOperations);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ internal class ListGlobbingPatternMatcher : IPathMatcher`
`11`	`11`	`{`
`12`	`12`	`private readonly IReadOnlyList<IPathMatcher> _pathMatchers;`
`13`	`13`
`14`		`- private string _displayPattern;`
	`14`	`+ private string? _displayPattern;`
`15`	`15`
`16`	`16`	`internal ListGlobbingPatternMatcher(IList<string> patternList)`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ internal static class ConditionalBlockCommentConfig`
`15`	`15`	`{`
`16`	`16`	`internal static List<IOperationProvider> ConfigureFromJObject(JObject rawConfiguration)`
`17`	`17`	`{`
`18`		`- string startToken = rawConfiguration.ToString("startToken");`
`19`		`- string endToken = rawConfiguration.ToString("endToken");`
	`18`	`+ string? startToken = rawConfiguration.ToString("startToken");`
	`19`	`+ string? endToken = rawConfiguration.ToString("endToken");`
`20`	`20`
`21`	`21`	`if (string.IsNullOrWhiteSpace(startToken))`
`22`	`22`	`{`
`@@ -27,7 +27,7 @@ internal static List<IOperationProvider> ConfigureFromJObject(JObject rawConfigu`
`27`	`27`	`throw new TemplateAuthoringException($"Template authoring error. EndToken must be defined", "EndToken");`
`28`	`28`	`}`
`29`	`29`
`30`		`- string pseudoEndToken = rawConfiguration.ToString("pseudoEndToken");`
	`30`	`+ string? pseudoEndToken = rawConfiguration.ToString("pseudoEndToken");`
`31`	`31`
`32`	`32`	`ConditionalKeywords keywords = ConditionalKeywords.FromJObject(rawConfiguration);`
`33`	`33`	`ConditionalOperationOptions options = ConditionalOperationOptions.FromJObject(rawConfiguration);`
`@@ -47,11 +47,11 @@ internal static List<IOperationProvider> GenerateConditionalSetup(string startTo`
`47`	`47`	`return GenerateConditionalSetup(startToken, endToken, new ConditionalKeywords(), new ConditionalOperationOptions());`
`48`	`48`	`}`
`49`	`49`
`50`		`- internal static List<IOperationProvider> GenerateConditionalSetup(string startToken, string endToken, ConditionalKeywords keywords, ConditionalOperationOptions options)`
	`50`	`+ internal static List<IOperationProvider> GenerateConditionalSetup(string? startToken, string? endToken, ConditionalKeywords keywords, ConditionalOperationOptions options)`
`51`	`51`	`{`
`52`		`- string pseudoEndComment;`
	`52`	`+ string? pseudoEndComment;`
`53`	`53`
`54`		`- if (endToken.Length < 2)`
	`54`	`+ if (endToken is null \|\| endToken.Length < 2)`
`55`	`55`	`{`
`56`	`56`	`// end comment must be at least two characters to have a programmatically determined pseudo-comment`
`57`	`57`	`pseudoEndComment = null;`
`@@ -65,12 +65,12 @@ internal static List<IOperationProvider> GenerateConditionalSetup(string startTo`
`65`	`65`	`return GenerateConditionalSetup(startToken, endToken, pseudoEndComment, keywords, options);`
`66`	`66`	`}`
`67`	`67`
`68`		`- internal static List<IOperationProvider> GenerateConditionalSetup(string startToken, string endToken, string pseudoEndToken)`
	`68`	`+ internal static List<IOperationProvider> GenerateConditionalSetup(string? startToken, string? endToken, string? pseudoEndToken)`
`69`	`69`	`{`
`70`	`70`	`return GenerateConditionalSetup(startToken, endToken, pseudoEndToken, new ConditionalKeywords(), new ConditionalOperationOptions());`
`71`	`71`	`}`
`72`	`72`
`73`		`- internal static List<IOperationProvider> GenerateConditionalSetup(string startToken, string endToken, string pseudoEndToken, ConditionalKeywords keywords, ConditionalOperationOptions options)`
	`73`	`+ internal static List<IOperationProvider> GenerateConditionalSetup(string? startToken, string? endToken, string? pseudoEndToken, ConditionalKeywords keywords, ConditionalOperationOptions options)`
`74`	`74`	`{`
`75`	`75`	`ConditionEvaluator evaluator = EvaluatorSelector.Select(options.EvaluatorType);`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ internal class ConditionalConfig : IOperationConfig`
`22`	`22`	`public IEnumerable<IOperationProvider> ConfigureFromJson(string configuration, IDirectory templateRoot)`
`23`	`23`	`{`
`24`	`24`	`JObject rawConfiguration = JObject.Parse(configuration);`
`25`		`- string commentStyle = rawConfiguration.ToString("style");`
	`25`	`+ string? commentStyle = rawConfiguration.ToString("style");`
`26`	`26`	`IEnumerable<IOperationProvider> operations = string.IsNullOrEmpty(commentStyle) \|\| string.Equals(commentStyle, "custom", StringComparison.OrdinalIgnoreCase)`
`27`	`27`	`? ConditionalCustomConfig.ConfigureFromJObject(rawConfiguration)`
`28`	`28`	`: string.Equals(commentStyle, "line", StringComparison.OrdinalIgnoreCase)`
`@@ -36,7 +36,7 @@ public IEnumerable<IOperationProvider> ConfigureFromJson(string configuration, I`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- internal static IReadOnlyList<IOperationProvider> ConditionalSetup(ConditionalType style, string evaluatorType, bool wholeLine, bool trimWhiteSpace, string id)`
	`39`	`+ internal static IReadOnlyList<IOperationProvider> ConditionalSetup(ConditionalType style, string evaluatorType, bool wholeLine, bool trimWhiteSpace, string? id)`
`40`	`40`	`{`
`41`	`41`	`List<IOperationProvider> setup;`
`42`	`42`
`@@ -134,7 +134,7 @@ internal static List<IOperationProvider> MSBuildConditionalSetup(string evaluato`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Nice to have: Generalize this type of setup similarly to Line, Block, & Custom`
`137`		`- internal static List<IOperationProvider> CStyleNoCommentsConditionalSetup(string evaluatorType, bool wholeLine, bool trimWhiteSpace, string id)`
	`137`	`+ internal static List<IOperationProvider> CStyleNoCommentsConditionalSetup(string evaluatorType, bool wholeLine, bool trimWhiteSpace, string? id)`
`138`	`138`	`{`
`139`	`139`	`ConditionalKeywords defaultKeywords = new ConditionalKeywords();`
`140`	`140`
Original file line number	Diff line number	Diff line change
`@@ -38,31 +38,31 @@ internal ConditionalKeywords()`
`38`	`38`	`internal static ConditionalKeywords FromJObject(JObject rawConfiguration)`
`39`	`39`	`{`
`40`	`40`	`ConditionalKeywords keywords = new ConditionalKeywords();`
`41`		`- string ifKeyword = rawConfiguration.ToString("ifKeyword");`
	`41`	`+ string? ifKeyword = rawConfiguration.ToString("ifKeyword");`
`42`	`42`	`if (!string.IsNullOrWhiteSpace(ifKeyword))`
`43`	`43`	`{`
`44`		`- keywords.IfKeywords = new[] { ifKeyword };`
	`44`	`+ keywords.IfKeywords = new[] { ifKeyword! };`
`45`	`45`	`}`
`46`	`46`
`47`		`- string elseIfKeyword = rawConfiguration.ToString("elseIfKeyword");`
	`47`	`+ string? elseIfKeyword = rawConfiguration.ToString("elseIfKeyword");`
`48`	`48`	`if (!string.IsNullOrWhiteSpace(elseIfKeyword))`
`49`	`49`	`{`
`50`		`- keywords.ElseIfKeywords = new[] { elseIfKeyword };`
	`50`	`+ keywords.ElseIfKeywords = new[] { elseIfKeyword! };`
`51`	`51`	`}`
`52`	`52`
`53`		`- string elseKeyword = rawConfiguration.ToString("elseKeyword");`
	`53`	`+ string? elseKeyword = rawConfiguration.ToString("elseKeyword");`
`54`	`54`	`if (!string.IsNullOrWhiteSpace(elseKeyword))`
`55`	`55`	`{`
`56`		`- keywords.ElseKeywords = new[] { elseKeyword };`
	`56`	`+ keywords.ElseKeywords = new[] { elseKeyword! };`
`57`	`57`	`}`
`58`	`58`
`59`		`- string endIfKeyword = rawConfiguration.ToString("endIfKeyword");`
	`59`	`+ string? endIfKeyword = rawConfiguration.ToString("endIfKeyword");`
`60`	`60`	`if (!string.IsNullOrWhiteSpace(endIfKeyword))`
`61`	`61`	`{`
`62`		`- keywords.EndIfKeywords = new[] { endIfKeyword };`
	`62`	`+ keywords.EndIfKeywords = new[] { endIfKeyword! };`
`63`	`63`	`}`
`64`	`64`
`65`		`- string prefixString = rawConfiguration.ToString("keywordPrefix");`
	`65`	`+ string? prefixString = rawConfiguration.ToString("keywordPrefix");`
`66`	`66`	`if (prefixString != null)`
`67`	`67`	`{`
`68`	`68`	`// Empty string is a valid value for keywordPrefix, null is not.`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal static class ConditionalLineCommentConfig`
`14`	`14`	`{`
`15`	`15`	`internal static List<IOperationProvider> ConfigureFromJObject(JObject rawConfiguration)`
`16`	`16`	`{`
`17`		`- string token = rawConfiguration.ToString("token");`
	`17`	`+ string? token = rawConfiguration.ToString("token");`
`18`	`18`
`19`	`19`	`if (string.IsNullOrWhiteSpace(token))`
`20`	`20`	`{`
`@@ -33,7 +33,7 @@ internal static List<IOperationProvider> GenerateConditionalSetup(string token)`
`33`	`33`	`return GenerateConditionalSetup(token, new ConditionalKeywords(), new ConditionalOperationOptions());`
`34`	`34`	`}`
`35`	`35`
`36`		`- internal static List<IOperationProvider> GenerateConditionalSetup(string token, ConditionalKeywords keywords, ConditionalOperationOptions options)`
	`36`	`+ internal static List<IOperationProvider> GenerateConditionalSetup(string? token, ConditionalKeywords keywords, ConditionalOperationOptions options)`
`37`	`37`	`{`
`38`	`38`	`string uncommentOperationId = $"Uncomment (line): {token} -> ()";`
`39`	`39`	`string reduceCommentOperationId = $"Reduce comment (line): ({token}{token}) -> ({token})";`