Merge branch 'master' into 1360_dom_renderer

src/renderer/ColorManager.test.ts

@@ -33,10 +33,10 @@ describe('ColorManager', () => {
 
   describe('constructor', () => {
     it('should fill all colors with values', () => {
-      for (let key of Object.keys(cm.colors)) {
+      for (const key of Object.keys(cm.colors)) {
         if (key !== 'ansi') {
           // A #rrggbb or rgba(...)
-          assert.ok(cm.colors[key].css.length >= 7);
+          assert.ok((<any>cm.colors)[key].css.length >= 7);
         }
       }
       assert.equal(cm.colors.ansi.length, 256);

src/renderer/ColorManager.ts

@@ -42,7 +42,7 @@ export const DEFAULT_ANSI_COLORS = (() => {
 
   // Fill in the remaining 240 ANSI colors.
   // Generate colors (16-231)
-  let v = [0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff];
+  const v = [0x00, 0x5f, 0x87, 0xaf, 0xd7, 0xff];
   for (let i = 0; i < 216; i++) {
     const r = v[(i / 36) % 6 | 0];
     const g = v[(i / 6) % 6 | 0];
@@ -75,7 +75,7 @@ function fromHex(css: string): IColor {
 }
 
 function toPaddedHex(c: number): string {
-  let s = c.toString(16);
+  const s = c.toString(16);
   return s.length < 2 ? '0' + s : s;
 }
 

src/renderer/atlas/CharAtlasUtils.ts

@@ -9,7 +9,7 @@ import { ICharAtlasConfig } from '../../shared/atlas/Types';
 
 export function generateConfig(scaledCharWidth: number, scaledCharHeight: number, terminal: ITerminal, colors: IColorSet): ICharAtlasConfig {
   // null out some fields that don't matter
-  const clonedColors = {
+  const clonedColors = <IColorSet>{
     foreground: colors.foreground,
     background: colors.background,
     cursor: null,

src/renderer/atlas/LRUMap.ts

@@ -11,7 +11,7 @@ interface ILinkedListNode<T> {
 }
 
 export default class LRUMap<T> {
-  private _map = {};
+  private _map: { [key: string]: ILinkedListNode<T> } = {};
   private _head: ILinkedListNode<T> = null;
   private _tail: ILinkedListNode<T> = null;
   private _nodePool: ILinkedListNode<T>[] = [];