Switching to a "Terminal" palette instead of ConsoleColor

Jaykul · Jaykul · commit 3f28dfa470fc · 2025-05-01T00:11:12.000-04:00
diff --git a/Source/Assembly/Palettes/ConsolePalette.cs b/Source/Assembly/Palettes/ConsolePalette.cs
@@ -10,22 +10,22 @@ public class ConsolePalette : Palette<RgbColor>
         public ConsolePalette()
         {
             // The ConsolePalette needs to be in the .NET ConsoleColors enum order
-            Add(new RgbColor(0x00, 0x00, 0x00));
-            Add(new RgbColor(0x00, 0x00, 0x80));
-            Add(new RgbColor(0x00, 0x80, 0x00));
-            Add(new RgbColor(0x00, 0x80, 0x80));
-            Add(new RgbColor(0x80, 0x00, 0x00));
-            Add(new RgbColor(0x80, 0x00, 0x80));
-            Add(new RgbColor(0x80, 0x80, 0x00));
-            Add(new RgbColor(0xc0, 0xc0, 0xc0));
-            Add(new RgbColor(0x80, 0x80, 0x80));
-            Add(new RgbColor(0x00, 0x00, 0xff));
-            Add(new RgbColor(0x00, 0xff, 0x00));
-            Add(new RgbColor(0x00, 0xff, 0xff));
-            Add(new RgbColor(0xff, 0x00, 0x00));
-            Add(new RgbColor(0xff, 0x00, 0xff));
-            Add(new RgbColor(0xff, 0xff, 0x00));
-            Add(new RgbColor(0xff, 0xff, 0xff));
+            Add(new RgbColor(0x00, 0x00, 0x00, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x00, 0x00, 0x80, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x00, 0x80, 0x00, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x00, 0x80, 0x80, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x80, 0x00, 0x00, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x80, 0x00, 0x80, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x80, 0x80, 0x00, ColorMode.ConsoleColor));
+            Add(new RgbColor(0xc0, 0xc0, 0xc0, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x80, 0x80, 0x80, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x00, 0x00, 0xff, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x00, 0xff, 0x00, ColorMode.ConsoleColor));
+            Add(new RgbColor(0x00, 0xff, 0xff, ColorMode.ConsoleColor));
+            Add(new RgbColor(0xff, 0x00, 0x00, ColorMode.ConsoleColor));
+            Add(new RgbColor(0xff, 0x00, 0xff, ColorMode.ConsoleColor));
+            Add(new RgbColor(0xff, 0xff, 0x00, ColorMode.ConsoleColor));
+            Add(new RgbColor(0xff, 0xff, 0xff, ColorMode.ConsoleColor));
         }
     }
 }
diff --git a/Source/Assembly/Palettes/NamedPalette.cs b/Source/Assembly/Palettes/NamedPalette.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections;
+﻿using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Linq;
@@ -12,22 +13,20 @@ namespace PoshCode.Pansies.Palettes
 {
     public class NamedPalette<T> : Palette<T>, IReadOnlyDictionary<string, T>, IArgumentCompleter where T : IColorSpace, new()
     {
-        private IList<string> names = new List<string>();
+        private List<string> names = new List<string>();
 
         public IEnumerable<CompletionResult> CompleteArgument(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)
         {
             WildcardPattern wildcard = new WildcardPattern(wordToComplete + "*", WildcardOptions.IgnoreCase);
 
-            foreach (var name in Keys.Where(s => wildcard.IsMatch(s.ToString())))
+            foreach (var name in names.Where(wildcard.IsMatch))
             {
-                yield return new CompletionResult(name.ToString(), dictionary[name].ToVTEscapeSequence(true) + " \u001B[0m " + name.ToString(), CompletionResultType.ParameterValue, name.ToString());
+                yield return new CompletionResult(name.ToString(), nativeColors[names.IndexOf(name)].ToVTEscapeSequence(true) + " \u001B[0m " + name, CompletionResultType.ParameterValue, name);
             }
         }
 
-        private readonly IDictionary<string, T> dictionary;
         public NamedPalette()
         {
-            dictionary = new Dictionary<string, T>();
         }
 
         public NamedPalette(IColorSpaceComparison comparisonAlgorithm) : this()
@@ -42,18 +41,8 @@ public virtual void Add(string key, T value) {
             Add(value);
         }
 
-        public virtual bool ContainsKey(string key) => names.Contains(key);
+        public virtual bool ContainsKey(string key) => names.Contains(key, StringComparer.OrdinalIgnoreCase);
 
-        public virtual bool TryGetValue(string key, out T value) {
-            var index = names.IndexOf(key);
-            if (index >= 0)
-            {
-                value = nativeColors[index];
-                return true;
-            }
-            value = default;
-            return false;
-        }
 
         // public virtual void Add(KeyValuePair<string, T> items) => dictionary.Add(items);
 
@@ -83,15 +72,14 @@ IEnumerator<KeyValuePair<string, T>> IEnumerable<KeyValuePair<string, T>>.GetEnu
             }
         }
 
-        public int IndexOf(string key) => names.IndexOf(key);
-
+        public int IndexOf(string key) => names.FindIndex(x => x.Equals(key, StringComparison.OrdinalIgnoreCase));
         public string FindClosestColorName(IColorSpace color)
         {
             return names[FindClosestColor<T>(color).Index];
         }
 
         public T GetValue(string key) {
-            var index = names.IndexOf(key);
+            var index = IndexOf(key);
             if (index >= 0)
             {
                 return nativeColors[index];
@@ -116,7 +104,7 @@ public T GetValue(string key) {
         }
         public virtual bool Remove(string key)
         {
-            var index = names.IndexOf(key);
+            var index = IndexOf(key);
             if (index >= 0) {
                 ((Palette<T>)this).RemoveAt(index);
                 names.RemoveAt(index);
@@ -130,14 +118,20 @@ public virtual bool Remove(string key)
             names.RemoveAt(index);
         }
 
-        bool IReadOnlyDictionary<string, T>.ContainsKey(string key)
-        {
-            throw new System.NotImplementedException();
-        }
+        bool IReadOnlyDictionary<string, T>.ContainsKey(string key) => ContainsKey(key);
+
+        bool IReadOnlyDictionary<string, T>.TryGetValue(string key, out T value) => TryGetValue(key, out value);
 
-        bool IReadOnlyDictionary<string, T>.TryGetValue(string key, out T value)
+        public virtual bool TryGetValue(string key, out T value)
         {
-            throw new System.NotImplementedException();
+            var index = IndexOf(key);
+            if (index >= 0)
+            {
+                value = nativeColors[index];
+                return true;
+            }
+            value = default;
+            return false;
         }
 
         new public KeyValuePair<string,T> this[int index]
diff --git a/Source/Assembly/Palettes/TerminalPalette.cs b/Source/Assembly/Palettes/TerminalPalette.cs
@@ -9,23 +9,23 @@ public class TerminalPalette : NamedPalette<RgbColor>
 
         public TerminalPalette()
         {
-            Add("Black", new RgbColor(System.ConsoleColor.Black));
-            Add("Red", new RgbColor(System.ConsoleColor.DarkRed));
-            Add("Green", new RgbColor(System.ConsoleColor.DarkGreen));
-            Add("Yellow", new RgbColor(System.ConsoleColor.DarkYellow));
-            Add("Blue", new RgbColor(System.ConsoleColor.DarkBlue));
-            Add("Magenta", new RgbColor(System.ConsoleColor.DarkMagenta));
-            Add("Cyan", new RgbColor(System.ConsoleColor.DarkCyan));
-            Add("White", new RgbColor(System.ConsoleColor.Gray));
-            Add("BrightBlack", new RgbColor(System.ConsoleColor.DarkGray));
-            Add("BrightRed", new RgbColor(System.ConsoleColor.Red));
-            Add("BrightGreen", new RgbColor(System.ConsoleColor.Green));
-            Add("BrightYellow", new RgbColor(System.ConsoleColor.Yellow));
-            Add("BrightBlue", new RgbColor(System.ConsoleColor.Blue));
-            Add("BrightMagenta", new RgbColor(System.ConsoleColor.Magenta));
-            Add("BrightCyan", new RgbColor(System.ConsoleColor.Cyan));
-            Add("BrightWhite", new RgbColor(System.ConsoleColor.White));
-            Add("Default", new RgbColor("Default"));
+            Add("Black", new RgbColor(0x00, 0x00, 0x00, ColorMode.TerminalColor));
+            Add("Red", new RgbColor(0x80, 0x00, 0x00, ColorMode.TerminalColor));
+            Add("Green", new RgbColor(0x00, 0x80, 0x00, ColorMode.TerminalColor));
+            Add("Yellow", new RgbColor(0x80, 0x80, 0x00, ColorMode.TerminalColor));
+            Add("Blue", new RgbColor(0x00, 0x00, 0x80, ColorMode.TerminalColor));
+            Add("Magenta", new RgbColor(0x80, 0x00, 0x80, ColorMode.TerminalColor));
+            Add("Cyan", new RgbColor(0x00, 0x80, 0x80, ColorMode.TerminalColor));
+            Add("White", new RgbColor(0xc0, 0xc0, 0xc0, ColorMode.TerminalColor));
+            Add("BrightBlack", new RgbColor(0x80, 0x80, 0x80, ColorMode.TerminalColor));
+            Add("BrightRed", new RgbColor(0xff, 0x00, 0x00, ColorMode.TerminalColor));
+            Add("BrightGreen", new RgbColor(0x00, 0xff, 0x00, ColorMode.TerminalColor));
+            Add("BrightYellow", new RgbColor(0xff, 0xff, 0x00, ColorMode.TerminalColor));
+            Add("BrightBlue", new RgbColor(0x00, 0x00, 0xff, ColorMode.TerminalColor));
+            Add("BrightMagenta", new RgbColor(0xff, 0x00, 0xff, ColorMode.TerminalColor));
+            Add("BrightCyan", new RgbColor(0x00, 0xff, 0xff, ColorMode.TerminalColor));
+            Add("BrightWhite", new RgbColor(0xff, 0xff, 0xff, ColorMode.TerminalColor));
+            Add("Default", new RgbColor(-1,-1,-1, ColorMode.TerminalColor));
         }
     }
 }
diff --git a/Source/Assembly/Palettes/X11Palette.cs b/Source/Assembly/Palettes/X11Palette.cs
@@ -8,7 +8,7 @@
 
 namespace PoshCode.Pansies.Palettes
 {
-    public class X11Palette : NamedPalette<RgbColor>, IArgumentCompleter
+    public class X11Palette : NamedPalette<RgbColor>
     {
         public X11Palette()
         {
diff --git a/Source/Assembly/RgbColor.cs b/Source/Assembly/RgbColor.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Collections;`
	`1`	`+using System;`
	`2`	`+using System.Collections;`
`2`	`3`	`using System.Collections.Generic;`
`3`	`4`	`using System.Collections.Specialized;`
`4`	`5`	`using System.Linq;`
`@@ -12,22 +13,20 @@ namespace PoshCode.Pansies.Palettes`
`12`	`13`	`{`
`13`	`14`	`public class NamedPalette<T> : Palette<T>, IReadOnlyDictionary<string, T>, IArgumentCompleter where T : IColorSpace, new()`
`14`	`15`	`{`
`15`		`- private IList<string> names = new List<string>();`
	`16`	`+ private List<string> names = new List<string>();`
`16`	`17`
`17`	`18`	`public IEnumerable<CompletionResult> CompleteArgument(string commandName, string parameterName, string wordToComplete, CommandAst commandAst, IDictionary fakeBoundParameters)`
`18`	`19`	`{`
`19`	`20`	`WildcardPattern wildcard = new WildcardPattern(wordToComplete + "*", WildcardOptions.IgnoreCase);`
`20`	`21`
`21`		`- foreach (var name in Keys.Where(s => wildcard.IsMatch(s.ToString())))`
	`22`	`+ foreach (var name in names.Where(wildcard.IsMatch))`
`22`	`23`	`{`
`23`		`- yield return new CompletionResult(name.ToString(), dictionary[name].ToVTEscapeSequence(true) + " \u001B[0m " + name.ToString(), CompletionResultType.ParameterValue, name.ToString());`
	`24`	`+ yield return new CompletionResult(name.ToString(), nativeColors[names.IndexOf(name)].ToVTEscapeSequence(true) + " \u001B[0m " + name, CompletionResultType.ParameterValue, name);`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`
`27`		`- private readonly IDictionary<string, T> dictionary;`
`28`	`28`	`public NamedPalette()`
`29`	`29`	`{`
`30`		`- dictionary = new Dictionary<string, T>();`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`public NamedPalette(IColorSpaceComparison comparisonAlgorithm) : this()`
`@@ -42,18 +41,8 @@ public virtual void Add(string key, T value) {`
`42`	`41`	`Add(value);`
`43`	`42`	`}`
`44`	`43`
`45`		`- public virtual bool ContainsKey(string key) => names.Contains(key);`
	`44`	`+ public virtual bool ContainsKey(string key) => names.Contains(key, StringComparer.OrdinalIgnoreCase);`
`46`	`45`
`47`		`- public virtual bool TryGetValue(string key, out T value) {`
`48`		`- var index = names.IndexOf(key);`
`49`		`- if (index >= 0)`
`50`		`- {`
`51`		`- value = nativeColors[index];`
`52`		`- return true;`
`53`		`- }`
`54`		`- value = default;`
`55`		`- return false;`
`56`		`- }`
`57`	`46`
`58`	`47`	`// public virtual void Add(KeyValuePair<string, T> items) => dictionary.Add(items);`
`59`	`48`
`@@ -83,15 +72,14 @@ IEnumerator<KeyValuePair<string, T>> IEnumerable<KeyValuePair<string, T>>.GetEnu`
`83`	`72`	`}`
`84`	`73`	`}`
`85`	`74`
`86`		`- public int IndexOf(string key) => names.IndexOf(key);`
`87`		`-`
	`75`	`+ public int IndexOf(string key) => names.FindIndex(x => x.Equals(key, StringComparison.OrdinalIgnoreCase));`
`88`	`76`	`public string FindClosestColorName(IColorSpace color)`
`89`	`77`	`{`
`90`	`78`	`return names[FindClosestColor<T>(color).Index];`
`91`	`79`	`}`
`92`	`80`
`93`	`81`	`public T GetValue(string key) {`
`94`		`- var index = names.IndexOf(key);`
	`82`	`+ var index = IndexOf(key);`
`95`	`83`	`if (index >= 0)`
`96`	`84`	`{`
`97`	`85`	`return nativeColors[index];`
`@@ -116,7 +104,7 @@ public T GetValue(string key) {`
`116`	`104`	`}`
`117`	`105`	`public virtual bool Remove(string key)`
`118`	`106`	`{`
`119`		`- var index = names.IndexOf(key);`
	`107`	`+ var index = IndexOf(key);`
`120`	`108`	`if (index >= 0) {`
`121`	`109`	`((Palette<T>)this).RemoveAt(index);`
`122`	`110`	`names.RemoveAt(index);`
`@@ -130,14 +118,20 @@ public virtual bool Remove(string key)`
`130`	`118`	`names.RemoveAt(index);`
`131`	`119`	`}`
`132`	`120`
`133`		`- bool IReadOnlyDictionary<string, T>.ContainsKey(string key)`
`134`		`- {`
`135`		`- throw new System.NotImplementedException();`
`136`		`- }`
	`121`	`+ bool IReadOnlyDictionary<string, T>.ContainsKey(string key) => ContainsKey(key);`
	`122`	`+`
	`123`	`+ bool IReadOnlyDictionary<string, T>.TryGetValue(string key, out T value) => TryGetValue(key, out value);`
`137`	`124`
`138`		`- bool IReadOnlyDictionary<string, T>.TryGetValue(string key, out T value)`
	`125`	`+ public virtual bool TryGetValue(string key, out T value)`
`139`	`126`	`{`
`140`		`- throw new System.NotImplementedException();`
	`127`	`+ var index = IndexOf(key);`
	`128`	`+ if (index >= 0)`
	`129`	`+ {`
	`130`	`+ value = nativeColors[index];`
	`131`	`+ return true;`
	`132`	`+ }`
	`133`	`+ value = default;`
	`134`	`+ return false;`
`141`	`135`	`}`
`142`	`136`
`143`	`137`	`new public KeyValuePair<string,T> this[int index]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace PoshCode.Pansies.Palettes`
`10`	`10`	`{`
`11`		`- public class X11Palette : NamedPalette<RgbColor>, IArgumentCompleter`
	`11`	`+ public class X11Palette : NamedPalette<RgbColor>`
`12`	`12`	`{`
`13`	`13`	`public X11Palette()`
`14`	`14`	`{`