From 09a5fd4e61e45479b64e29a1e639cb5e53d1c735 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sat, 6 Apr 2019 15:06:42 -0400
Subject: [PATCH] Fix capitalization in color mode

---
 src/BufferLine.ts        |  4 ++--
 src/InputHandler.test.ts | 36 ++++++++++++++++++------------------
 src/Types.ts             |  4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/BufferLine.ts b/src/BufferLine.ts
index bf0683d0..2bd5a113 100644
--- a/src/BufferLine.ts
+++ b/src/BufferLine.ts
@@ -165,8 +165,8 @@ export class AttributeData implements IAttributeData {
   public isDim(): number       { return this.bg & BgFlags.DIM; }
 
   // color modes
-  public getFgColormode(): number { return this.fg & Attributes.CM_MASK; }
-  public getBgColormode(): number { return this.bg & Attributes.CM_MASK; }
+  public getFgColorMode(): number { return this.fg & Attributes.CM_MASK; }
+  public getBgColorMode(): number { return this.bg & Attributes.CM_MASK; }
   public isFgRGB(): boolean       { return (this.fg & Attributes.CM_MASK) === Attributes.CM_RGB; }
   public isBgRGB(): boolean       { return (this.bg & Attributes.CM_MASK) === Attributes.CM_RGB; }
   public isFgPalette(): boolean   { return (this.fg & Attributes.CM_MASK) === Attributes.CM_P16 || (this.fg & Attributes.CM_MASK) === Attributes.CM_P256; }
diff --git a/src/InputHandler.test.ts b/src/InputHandler.test.ts
index 0b7f7ad3..01596f80 100644
--- a/src/InputHandler.test.ts
+++ b/src/InputHandler.test.ts
@@ -447,53 +447,53 @@ describe('InputHandler', () => {
       assert.equal(!!term.curAttrData.isInvisible(), false);
     });
     it('colormode palette 16', () => {
-      assert.equal(term.curAttrData.getFgColormode(), 0); // DEFAULT
-      assert.equal(term.curAttrData.getBgColormode(), 0); // DEFAULT
+      assert.equal(term.curAttrData.getFgColorMode(), 0); // DEFAULT
+      assert.equal(term.curAttrData.getBgColorMode(), 0); // DEFAULT
       // lower 8 colors
       for (let i = 0; i < 8; ++i) {
         term.writeSync(`\x1b[${i + 30};${i + 40}m`);
-        assert.equal(term.curAttrData.getFgColormode(), Attributes.CM_P16);
+        assert.equal(term.curAttrData.getFgColorMode(), Attributes.CM_P16);
         assert.equal(term.curAttrData.getFgColor(), i);
-        assert.equal(term.curAttrData.getBgColormode(), Attributes.CM_P16);
+        assert.equal(term.curAttrData.getBgColorMode(), Attributes.CM_P16);
         assert.equal(term.curAttrData.getBgColor(), i);
       }
       // reset to DEFAULT
       term.writeSync(`\x1b[39;49m`);
-      assert.equal(term.curAttrData.getFgColormode(), 0);
-      assert.equal(term.curAttrData.getBgColormode(), 0);
+      assert.equal(term.curAttrData.getFgColorMode(), 0);
+      assert.equal(term.curAttrData.getBgColorMode(), 0);
     });
     it('colormode palette 256', () => {
-      assert.equal(term.curAttrData.getFgColormode(), 0); // DEFAULT
-      assert.equal(term.curAttrData.getBgColormode(), 0); // DEFAULT
+      assert.equal(term.curAttrData.getFgColorMode(), 0); // DEFAULT
+      assert.equal(term.curAttrData.getBgColorMode(), 0); // DEFAULT
       // lower 8 colors
       for (let i = 0; i < 256; ++i) {
         term.writeSync(`\x1b[38;5;${i};48;5;${i}m`);
-        assert.equal(term.curAttrData.getFgColormode(), Attributes.CM_P256);
+        assert.equal(term.curAttrData.getFgColorMode(), Attributes.CM_P256);
         assert.equal(term.curAttrData.getFgColor(), i);
-        assert.equal(term.curAttrData.getBgColormode(), Attributes.CM_P256);
+        assert.equal(term.curAttrData.getBgColorMode(), Attributes.CM_P256);
         assert.equal(term.curAttrData.getBgColor(), i);
       }
       // reset to DEFAULT
       term.writeSync(`\x1b[39;49m`);
-      assert.equal(term.curAttrData.getFgColormode(), 0);
+      assert.equal(term.curAttrData.getFgColorMode(), 0);
       assert.equal(term.curAttrData.getFgColor(), -1);
-      assert.equal(term.curAttrData.getBgColormode(), 0);
+      assert.equal(term.curAttrData.getBgColorMode(), 0);
       assert.equal(term.curAttrData.getBgColor(), -1);
     });
     it('colormode RGB', () => {
-      assert.equal(term.curAttrData.getFgColormode(), 0); // DEFAULT
-      assert.equal(term.curAttrData.getBgColormode(), 0); // DEFAULT
+      assert.equal(term.curAttrData.getFgColorMode(), 0); // DEFAULT
+      assert.equal(term.curAttrData.getBgColorMode(), 0); // DEFAULT
       term.writeSync(`\x1b[38;2;1;2;3;48;2;4;5;6m`);
-      assert.equal(term.curAttrData.getFgColormode(), Attributes.CM_RGB);
+      assert.equal(term.curAttrData.getFgColorMode(), Attributes.CM_RGB);
       assert.equal(term.curAttrData.getFgColor(), 1 << 16 | 2 << 8 | 3);
       assert.deepEqual(AttributeData.toColorRGB(term.curAttrData.getFgColor()), [1, 2, 3]);
-      assert.equal(term.curAttrData.getBgColormode(), Attributes.CM_RGB);
+      assert.equal(term.curAttrData.getBgColorMode(), Attributes.CM_RGB);
       assert.deepEqual(AttributeData.toColorRGB(term.curAttrData.getBgColor()), [4, 5, 6]);
       // reset to DEFAULT
       term.writeSync(`\x1b[39;49m`);
-      assert.equal(term.curAttrData.getFgColormode(), 0);
+      assert.equal(term.curAttrData.getFgColorMode(), 0);
       assert.equal(term.curAttrData.getFgColor(), -1);
-      assert.equal(term.curAttrData.getBgColormode(), 0);
+      assert.equal(term.curAttrData.getBgColorMode(), 0);
       assert.equal(term.curAttrData.getBgColor(), -1);
     });
     it('should zero missing RGB values', () => {
diff --git a/src/Types.ts b/src/Types.ts
index c05a3479..6e0108ae 100644
--- a/src/Types.ts
+++ b/src/Types.ts
@@ -540,8 +540,8 @@ export interface IAttributeData {
   isDim(): number;
 
   // color modes
-  getFgColormode(): number;
-  getBgColormode(): number;
+  getFgColorMode(): number;
+  getBgColorMode(): number;
   isFgRGB(): boolean;
   isBgRGB(): boolean;
   isFgPalette(): boolean;