Fix some CA1854 NetAnalyzers suggestions

Numpsy · Numpsy · commit 4361eace9994 · 2024-08-14T23:45:58.000+01:00
diff --git a/src/TextMateSharp/Internal/Grammars/BasicScopeAttributesProvider.cs b/src/TextMateSharp/Internal/Grammars/BasicScopeAttributesProvider.cs
@@ -123,7 +123,7 @@ private int ScopeToLanguage(string scope)
             }
 
             string scopeName = m.Groups[1].Value;
-            return _embeddedLanguages.ContainsKey(scopeName) ? _embeddedLanguages[scopeName] : 0;
+            return _embeddedLanguages.TryGetValue(scopeName, out int value) ? value : 0;
         }
 
         private static int ToStandardTokenType(string tokenType)
diff --git a/src/TextMateSharp/Internal/Grammars/Grammar.cs b/src/TextMateSharp/Internal/Grammars/Grammar.cs
@@ -156,9 +156,9 @@ public IRawGrammar GetExternalGrammar(string scopeName)
 
         public IRawGrammar GetExternalGrammar(string scopeName, IRawRepository repository)
         {
-            if (this._includedGrammars.ContainsKey(scopeName))
+            if (_includedGrammars.TryGetValue(scopeName, out IRawGrammar value))
             {
-                return this._includedGrammars[scopeName];
+                return value;
             }
             else if (this._grammarRepository != null)
             {
diff --git a/src/TextMateSharp/Internal/Grammars/SyncRegistry.cs b/src/TextMateSharp/Internal/Grammars/SyncRegistry.cs
@@ -91,25 +91,26 @@ public IGrammar GrammarForScopeName(
             Dictionary<string, int> tokenTypes,
             BalancedBracketSelectors balancedBracketSelectors)
         {
-            if (!this._grammars.ContainsKey(scopeName))
+            if (!_grammars.TryGetValue(scopeName, out IGrammar value))
             {
                 IRawGrammar rawGrammar = Lookup(scopeName);
                 if (rawGrammar == null)
                 {
                     return null;
                 }
-                this._grammars.Add(scopeName,
-                    new Grammar(
+
+                value = new Grammar(
                         scopeName,
                         rawGrammar,
                         initialLanguage,
                         embeddedLanguages,
                         tokenTypes,
                         balancedBracketSelectors,
                         this,
-                        this));
+                        this);
+                this._grammars.Add(scopeName, value);
             }
-            return this._grammars[scopeName];
+            return value;
         }
 
         private static void CollectIncludedScopes(ICollection<string> result, IRawGrammar grammar)
diff --git a/src/TextMateSharp/Themes/Theme.cs b/src/TextMateSharp/Themes/Theme.cs
@@ -322,11 +322,12 @@ internal List<ThemeTrieElementRule> Match(string scopeName)
         {
             lock (this._cachedMatchRoot)
             {
-                if (!this._cachedMatchRoot.ContainsKey(scopeName))
+                if (!_cachedMatchRoot.TryGetValue(scopeName, out List<ThemeTrieElementRule> value))
                 {
-                    this._cachedMatchRoot[scopeName] = this._root.Match(scopeName);
+                    value = this._root.Match(scopeName);
+                    this._cachedMatchRoot[scopeName] = value;
                 }
-                return this._cachedMatchRoot[scopeName];
+                return value;
             }
         }
 
diff --git a/src/TextMateSharp/Themes/ThemeTrieElement.cs b/src/TextMateSharp/Themes/ThemeTrieElement.cs
@@ -94,9 +94,9 @@ public List<ThemeTrieElementRule> Match(string scope)
                 tail = scope.Substring(dotIndex + 1);
             }
 
-            if (this.children.ContainsKey(head))
+            if (children.TryGetValue(head, out ThemeTrieElement value))
             {
-                return this.children[head].Match(tail);
+                return value.Match(tail);
             }
 
             arr = new List<ThemeTrieElementRule>();
@@ -130,9 +130,9 @@ public void Insert(string name, int scopeDepth, string scope, List<string> paren
             }
 
             ThemeTrieElement child;
-            if (this.children.ContainsKey(head))
+            if (children.TryGetValue(head, out ThemeTrieElement value))
             {
-                child = this.children[head];
+                child = value;
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ private int ScopeToLanguage(string scope)`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`string scopeName = m.Groups[1].Value;`
`126`		`- return _embeddedLanguages.ContainsKey(scopeName) ? _embeddedLanguages[scopeName] : 0;`
	`126`	`+ return _embeddedLanguages.TryGetValue(scopeName, out int value) ? value : 0;`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`private static int ToStandardTokenType(string tokenType)`
Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,9 @@ public IRawGrammar GetExternalGrammar(string scopeName)`
`156`	`156`
`157`	`157`	`public IRawGrammar GetExternalGrammar(string scopeName, IRawRepository repository)`
`158`	`158`	`{`
`159`		`- if (this._includedGrammars.ContainsKey(scopeName))`
	`159`	`+ if (_includedGrammars.TryGetValue(scopeName, out IRawGrammar value))`
`160`	`160`	`{`
`161`		`- return this._includedGrammars[scopeName];`
	`161`	`+ return value;`
`162`	`162`	`}`
`163`	`163`	`else if (this._grammarRepository != null)`
`164`	`164`	`{`
Original file line number	Diff line number	Diff line change
`@@ -91,25 +91,26 @@ public IGrammar GrammarForScopeName(`
`91`	`91`	`Dictionary<string, int> tokenTypes,`
`92`	`92`	`BalancedBracketSelectors balancedBracketSelectors)`
`93`	`93`	`{`
`94`		`- if (!this._grammars.ContainsKey(scopeName))`
	`94`	`+ if (!_grammars.TryGetValue(scopeName, out IGrammar value))`
`95`	`95`	`{`
`96`	`96`	`IRawGrammar rawGrammar = Lookup(scopeName);`
`97`	`97`	`if (rawGrammar == null)`
`98`	`98`	`{`
`99`	`99`	`return null;`
`100`	`100`	`}`
`101`		`- this._grammars.Add(scopeName,`
`102`		`- new Grammar(`
	`101`	`+`
	`102`	`+ value = new Grammar(`
`103`	`103`	`scopeName,`
`104`	`104`	`rawGrammar,`
`105`	`105`	`initialLanguage,`
`106`	`106`	`embeddedLanguages,`
`107`	`107`	`tokenTypes,`
`108`	`108`	`balancedBracketSelectors,`
`109`	`109`	`this,`
`110`		`- this));`
	`110`	`+ this);`
	`111`	`+ this._grammars.Add(scopeName, value);`
`111`	`112`	`}`
`112`		`- return this._grammars[scopeName];`
	`113`	`+ return value;`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`private static void CollectIncludedScopes(ICollection<string> result, IRawGrammar grammar)`
Original file line number	Diff line number	Diff line change
`@@ -322,11 +322,12 @@ internal List<ThemeTrieElementRule> Match(string scopeName)`
`322`	`322`	`{`
`323`	`323`	`lock (this._cachedMatchRoot)`
`324`	`324`	`{`
`325`		`- if (!this._cachedMatchRoot.ContainsKey(scopeName))`
	`325`	`+ if (!_cachedMatchRoot.TryGetValue(scopeName, out List<ThemeTrieElementRule> value))`
`326`	`326`	`{`
`327`		`- this._cachedMatchRoot[scopeName] = this._root.Match(scopeName);`
	`327`	`+ value = this._root.Match(scopeName);`
	`328`	`+ this._cachedMatchRoot[scopeName] = value;`
`328`	`329`	`}`
`329`		`- return this._cachedMatchRoot[scopeName];`
	`330`	`+ return value;`
`330`	`331`	`}`
`331`	`332`	`}`
`332`	`333`
Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,9 @@ public List<ThemeTrieElementRule> Match(string scope)`
`94`	`94`	`tail = scope.Substring(dotIndex + 1);`
`95`	`95`	`}`
`96`	`96`
`97`		`- if (this.children.ContainsKey(head))`
	`97`	`+ if (children.TryGetValue(head, out ThemeTrieElement value))`
`98`	`98`	`{`
`99`		`- return this.children[head].Match(tail);`
	`99`	`+ return value.Match(tail);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`arr = new List<ThemeTrieElementRule>();`
`@@ -130,9 +130,9 @@ public void Insert(string name, int scopeDepth, string scope, List<string> paren`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`ThemeTrieElement child;`
`133`		`- if (this.children.ContainsKey(head))`
	`133`	`+ if (children.TryGetValue(head, out ThemeTrieElement value))`
`134`	`134`	`{`
`135`		`- child = this.children[head];`
	`135`	`+ child = value;`
`136`	`136`	`}`
`137`	`137`	`else`
`138`	`138`	`{`