Merge pull request #2206 from Tyriar/options_move

Move OptionsService into services folder

src/Terminal.ts

@@ -52,8 +52,8 @@ import { Attributes, DEFAULT_ATTR_DATA } from 'core/buffer/BufferLine';
 import { applyWindowsMode } from './WindowsMode';
 import { ColorManager } from 'ui/ColorManager';
 import { RenderCoordinator } from './renderer/RenderCoordinator';
-import { IOptionsService } from 'common/options/Types';
-import { OptionsService } from 'common/options/OptionsService';
+import { IOptionsService } from 'common/services/Services';
+import { OptionsService } from 'common/services/OptionsService';
 import { ICharSizeService } from 'ui/services/Services';
 import { CharSizeService } from 'ui/services/CharSizeService';
 

src/TestUtils.test.ts

@@ -13,7 +13,7 @@ import { IDisposable, IMarker, IEvent, ISelectionPosition } from 'xterm';
 import { Terminal } from './Terminal';
 import { AttributeData } from 'core/buffer/BufferLine';
 import { IColorManager, IColorSet } from 'ui/Types';
-import { IOptionsService } from 'common/options/Types';
+import { IOptionsService } from 'common/services/Services';
 import { ICharSizeService } from 'ui/services/Services';
 
 export class TestTerminal extends Terminal {

src/Types.ts

@@ -8,7 +8,7 @@ import { ICharset, IAttributeData, ICellData, IBufferLine, CharData } from 'core
 import { ICircularList } from 'common/Types';
 import { IEvent } from 'common/EventEmitter2';
 import { IColorSet } from 'ui/Types';
-import { IOptionsService } from 'common/options/Types';
+import { IOptionsService } from 'common/services/Services';
 
 export type CustomKeyEventHandler = (event: KeyboardEvent) => boolean;
 

src/common/services/OptionsService.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IOptionsService, ITerminalOptions, IPartialTerminalOptions } from 'common/options/Types';
+import { IOptionsService, ITerminalOptions, IPartialTerminalOptions } from 'common/services/Services';
 import { EventEmitter2, IEvent } from 'common/EventEmitter2';
 import { isMac } from 'common/Platform';
 import { clone } from 'common/Clone';

src/common/services/Services.d.ts

@@ -6,10 +6,10 @@
 import { IEvent } from 'common/EventEmitter2';
 
 export interface IOptionsService {
-  readonly onOptionChange: IEvent<string>;
-  // TODO: as const?
   readonly options: ITerminalOptions;
 
+  readonly onOptionChange: IEvent<string>;
+
   setOption<T>(key: string, value: T): void;
   getOption<T>(key: string): T | undefined;
 }

src/renderer/RenderCoordinator.ts

@@ -11,7 +11,7 @@ import { ScreenDprMonitor } from 'ui/ScreenDprMonitor';
 import { addDisposableDomListener } from 'ui/Lifecycle';
 import { IColorSet } from 'ui/Types';
 import { CharacterJoinerHandler } from '../Types';
-import { IOptionsService } from 'common/options/Types';
+import { IOptionsService } from 'common/services/Services';
 import { ICharSizeService } from 'ui/services/Services';
 
 export class RenderCoordinator extends Disposable {

src/ui/services/CharSizeService.ts

@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IOptionsService } from 'common/options/Types';
+import { IOptionsService } from 'common/services/Services';
 import { IEvent, EventEmitter2 } from 'common/EventEmitter2';
 import { ICharSizeService } from 'ui/services/Services';