chore(tslint): align with clang:format

sebholstein · Oct 23, 2016 · ae0590e · ae0590e
1 parent f71542b
commit ae0590e
Show file tree

Hide file tree

Showing 24 changed files with 115 additions and 116 deletions.
diff --git a/src/core/core-module.ts b/src/core/core-module.ts
@@ -1,16 +1,16 @@
-import { ModuleWithProviders, NgModule } from '@angular/core';
+import {ModuleWithProviders, NgModule} from '@angular/core';
 
-import { SebmGoogleMap } from './directives/google-map';
-import { SebmGoogleMapCircle } from './directives/google-map-circle';
-import { SebmGoogleMapInfoWindow } from './directives/google-map-info-window';
-import { SebmGoogleMapMarker } from './directives/google-map-marker';
-import { SebmGoogleMapPolygon } from './directives/google-map-polygon';
-import { SebmGoogleMapPolyline } from './directives/google-map-polyline';
-import { SebmGoogleMapPolylinePoint } from './directives/google-map-polyline-point';
-import { LazyMapsAPILoader } from './services/maps-api-loader/lazy-maps-api-loader';
-import { LAZY_MAPS_API_CONFIG, LazyMapsAPILoaderConfigLiteral } from './services/maps-api-loader/lazy-maps-api-loader';
-import { MapsAPILoader } from './services/maps-api-loader/maps-api-loader';
-import { BROWSER_GLOBALS_PROVIDERS } from './utils/browser-globals';
+import {SebmGoogleMap} from './directives/google-map';
+import {SebmGoogleMapCircle} from './directives/google-map-circle';
+import {SebmGoogleMapInfoWindow} from './directives/google-map-info-window';
+import {SebmGoogleMapMarker} from './directives/google-map-marker';
+import {SebmGoogleMapPolygon} from './directives/google-map-polygon';
+import {SebmGoogleMapPolyline} from './directives/google-map-polyline';
+import {SebmGoogleMapPolylinePoint} from './directives/google-map-polyline-point';
+import {LazyMapsAPILoader} from './services/maps-api-loader/lazy-maps-api-loader';
+import {LAZY_MAPS_API_CONFIG, LazyMapsAPILoaderConfigLiteral} from './services/maps-api-loader/lazy-maps-api-loader';
+import {MapsAPILoader} from './services/maps-api-loader/maps-api-loader';
+import {BROWSER_GLOBALS_PROVIDERS} from './utils/browser-globals';
 
 /**
  * @internal

diff --git a/src/core/directives/google-map-circle.ts b/src/core/directives/google-map-circle.ts
@@ -1,10 +1,10 @@
-import { Directive, EventEmitter, OnChanges, OnDestroy, OnInit, SimpleChange } from '@angular/core';
-import { Subscription } from 'rxjs/Subscription';
+import {Directive, EventEmitter, OnChanges, OnDestroy, OnInit, SimpleChange} from '@angular/core';
+import {Subscription} from 'rxjs/Subscription';
 
-import { MouseEvent } from '../map-types';
-import { LatLng, LatLngBounds, LatLngLiteral } from '../services/google-maps-types';
-import { MouseEvent as MapMouseEvent } from '../services/google-maps-types';
-import { CircleManager } from '../services/managers/circle-manager';
+import {MouseEvent} from '../map-types';
+import {LatLng, LatLngBounds, LatLngLiteral} from '../services/google-maps-types';
+import {MouseEvent as MapMouseEvent} from '../services/google-maps-types';
+import {CircleManager} from '../services/managers/circle-manager';
 
 @Directive({
   selector: 'sebm-google-map-circle',

diff --git a/src/core/directives/google-map-info-window.ts b/src/core/directives/google-map-info-window.ts
@@ -1,8 +1,8 @@
-import { Component, ElementRef, EventEmitter, OnChanges, OnDestroy, SimpleChange, OnInit } from '@angular/core';
+import {Component, ElementRef, EventEmitter, OnChanges, OnDestroy, OnInit, SimpleChange} from '@angular/core';
 
-import { InfoWindowManager } from '../services/managers/info-window-manager';
+import {InfoWindowManager} from '../services/managers/info-window-manager';
 
-import { SebmGoogleMapMarker } from './google-map-marker';
+import {SebmGoogleMapMarker} from './google-map-marker';
 
 let infoWindowId = 0;
 

diff --git a/src/core/directives/google-map-marker.ts b/src/core/directives/google-map-marker.ts
@@ -1,11 +1,11 @@
-import { AfterContentInit, ContentChild, Directive, EventEmitter, OnChanges, OnDestroy, SimpleChange } from '@angular/core';
-import { Subscription } from 'rxjs/Subscription';
+import {AfterContentInit, ContentChild, Directive, EventEmitter, OnChanges, OnDestroy, SimpleChange} from '@angular/core';
+import {Subscription} from 'rxjs/Subscription';
 
-import { MouseEvent } from '../map-types';
+import {MouseEvent} from '../map-types';
 import * as mapTypes from '../services/google-maps-types';
-import { MarkerManager } from '../services/managers/marker-manager';
+import {MarkerManager} from '../services/managers/marker-manager';
 
-import { SebmGoogleMapInfoWindow } from './google-map-info-window';
+import {SebmGoogleMapInfoWindow} from './google-map-info-window';
 
 let markerId = 0;
 

diff --git a/src/core/directives/google-map-polygon.ts b/src/core/directives/google-map-polygon.ts
@@ -1,8 +1,8 @@
-import { AfterContentInit, Directive, EventEmitter, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
-import { Subscription } from 'rxjs/Subscription';
+import {AfterContentInit, Directive, EventEmitter, OnChanges, OnDestroy, SimpleChanges} from '@angular/core';
+import {Subscription} from 'rxjs/Subscription';
 
-import { LatLng, LatLngLiteral, PolyMouseEvent, PolygonOptions } from '../services/google-maps-types';
-import { PolygonManager } from '../services/managers/polygon-manager';
+import {LatLng, LatLngLiteral, PolyMouseEvent, PolygonOptions} from '../services/google-maps-types';
+import {PolygonManager} from '../services/managers/polygon-manager';
 
 /**
  * SebmGoogleMapPolygon renders a polygon on a {@link SebmGoogleMap}

diff --git a/src/core/directives/google-map-polyline-point.ts b/src/core/directives/google-map-polyline-point.ts
@@ -1,5 +1,5 @@
-import { Directive, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { LatLngLiteral } from '../../core/services/google-maps-types';
+import {Directive, EventEmitter, Input, OnChanges, Output, SimpleChanges} from '@angular/core';
+import {LatLngLiteral} from '../../core/services/google-maps-types';
 
 /**
  * SebmGoogleMapPolylinePoint represents one element of a polyline within a  {@link

diff --git a/src/core/directives/google-map-polyline.ts b/src/core/directives/google-map-polyline.ts
@@ -1,10 +1,10 @@
-import { AfterContentInit, ContentChildren, Directive, EventEmitter, OnChanges, OnDestroy, QueryList, SimpleChanges } from '@angular/core';
-import { Subscription } from 'rxjs/Subscription';
+import {AfterContentInit, ContentChildren, Directive, EventEmitter, OnChanges, OnDestroy, QueryList, SimpleChanges} from '@angular/core';
+import {Subscription} from 'rxjs/Subscription';
 
-import { PolyMouseEvent } from '../services/google-maps-types';
-import { PolylineManager } from '../services/managers/polyline-manager';
+import {PolyMouseEvent} from '../services/google-maps-types';
+import {PolylineManager} from '../services/managers/polyline-manager';
 
-import { SebmGoogleMapPolylinePoint } from './google-map-polyline-point';
+import {SebmGoogleMapPolylinePoint} from './google-map-polyline-point';
 
 let polylineId = 0;
 /**

diff --git a/src/core/directives/google-map.ts b/src/core/directives/google-map.ts
@@ -1,15 +1,15 @@
-import { Component, ElementRef, EventEmitter, OnChanges, OnInit, SimpleChange, OnDestroy } from '@angular/core';
-import { Subscription } from 'rxjs/Subscription';
-
-import { MouseEvent } from '../map-types';
-import { GoogleMapsAPIWrapper } from '../services/google-maps-api-wrapper';
-import { LatLng, LatLngLiteral } from '../services/google-maps-types';
-import { LatLngBounds, LatLngBoundsLiteral, MapTypeStyle } from '../services/google-maps-types';
-import { CircleManager } from '../services/managers/circle-manager';
-import { InfoWindowManager } from '../services/managers/info-window-manager';
-import { MarkerManager } from '../services/managers/marker-manager';
-import { PolygonManager } from '../services/managers/polygon-manager';
-import { PolylineManager } from '../services/managers/polyline-manager';
+import {Component, ElementRef, EventEmitter, OnChanges, OnDestroy, OnInit, SimpleChange} from '@angular/core';
+import {Subscription} from 'rxjs/Subscription';
+
+import {MouseEvent} from '../map-types';
+import {GoogleMapsAPIWrapper} from '../services/google-maps-api-wrapper';
+import {LatLng, LatLngLiteral} from '../services/google-maps-types';
+import {LatLngBounds, LatLngBoundsLiteral, MapTypeStyle} from '../services/google-maps-types';
+import {CircleManager} from '../services/managers/circle-manager';
+import {InfoWindowManager} from '../services/managers/info-window-manager';
+import {MarkerManager} from '../services/managers/marker-manager';
+import {PolygonManager} from '../services/managers/polygon-manager';
+import {PolylineManager} from '../services/managers/polyline-manager';
 
 /**
  * SebMGoogleMap renders a Google Map.

diff --git a/src/core/map-types.ts b/src/core/map-types.ts
@@ -1,4 +1,4 @@
-import { LatLngLiteral } from './services/google-maps-types';
+import {LatLngLiteral} from './services/google-maps-types';
 
 // exported map types
 export {LatLngBounds, LatLngBoundsLiteral, LatLngLiteral, PolyMouseEvent} from './services/google-maps-types';

diff --git a/src/core/services/google-maps-api-wrapper.ts b/src/core/services/google-maps-api-wrapper.ts
@@ -1,11 +1,11 @@
-import { Injectable, NgZone } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import {Injectable, NgZone} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
+import {Observer} from 'rxjs/Observer';
 
 import * as mapTypes from './google-maps-types';
-import { Polyline } from './google-maps-types';
-import { PolylineOptions } from './google-maps-types';
-import { MapsAPILoader } from './maps-api-loader/maps-api-loader';
+import {Polyline} from './google-maps-types';
+import {PolylineOptions} from './google-maps-types';
+import {MapsAPILoader} from './maps-api-loader/maps-api-loader';
 
 // todo: add types for this
 declare var google: any;

diff --git a/src/core/services/managers/circle-manager.ts b/src/core/services/managers/circle-manager.ts
@@ -1,10 +1,10 @@
-import { Injectable, NgZone } from '@angular/core';
+import {Injectable, NgZone} from '@angular/core';
 
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import {Observable} from 'rxjs/Observable';
+import {Observer} from 'rxjs/Observer';
 
-import { SebmGoogleMapCircle } from '../../directives/google-map-circle';
-import { GoogleMapsAPIWrapper } from '../google-maps-api-wrapper';
+import {SebmGoogleMapCircle} from '../../directives/google-map-circle';
+import {GoogleMapsAPIWrapper} from '../google-maps-api-wrapper';
 import * as mapTypes from '../google-maps-types';
 
 @Injectable()

diff --git a/src/core/services/managers/info-window-manager.ts b/src/core/services/managers/info-window-manager.ts
@@ -1,10 +1,10 @@
-import { Injectable, NgZone } from '@angular/core';
+import {Injectable, NgZone} from '@angular/core';
 
-import { SebmGoogleMapInfoWindow } from '../../directives/google-map-info-window';
+import {SebmGoogleMapInfoWindow} from '../../directives/google-map-info-window';
 
-import { GoogleMapsAPIWrapper } from '../google-maps-api-wrapper';
-import { InfoWindow, InfoWindowOptions } from '../google-maps-types';
-import { MarkerManager } from './marker-manager';
+import {GoogleMapsAPIWrapper} from '../google-maps-api-wrapper';
+import {InfoWindow, InfoWindowOptions} from '../google-maps-types';
+import {MarkerManager} from './marker-manager';
 
 @Injectable()
 export class InfoWindowManager {

diff --git a/src/core/services/managers/marker-manager.spec.ts b/src/core/services/managers/marker-manager.spec.ts
@@ -1,10 +1,10 @@
-import { NgZone } from '@angular/core';
-import { TestBed, async, inject } from '@angular/core/testing';
+import {NgZone} from '@angular/core';
+import {TestBed, async, inject} from '@angular/core/testing';
 
-import { SebmGoogleMapMarker } from './../../directives/google-map-marker';
-import { GoogleMapsAPIWrapper } from './../google-maps-api-wrapper';
-import { Marker } from './../google-maps-types';
-import { MarkerManager } from './../managers/marker-manager';
+import {SebmGoogleMapMarker} from './../../directives/google-map-marker';
+import {GoogleMapsAPIWrapper} from './../google-maps-api-wrapper';
+import {Marker} from './../google-maps-types';
+import {MarkerManager} from './../managers/marker-manager';
 
 describe('MarkerManager', () => {
   beforeEach(() => {

diff --git a/src/core/services/managers/marker-manager.ts b/src/core/services/managers/marker-manager.ts
@@ -1,11 +1,11 @@
-import { Injectable, NgZone } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import {Injectable, NgZone} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
+import {Observer} from 'rxjs/Observer';
 
-import { SebmGoogleMapMarker } from './../../directives/google-map-marker';
+import {SebmGoogleMapMarker} from './../../directives/google-map-marker';
 
-import { GoogleMapsAPIWrapper } from './../google-maps-api-wrapper';
-import { Marker } from './../google-maps-types';
+import {GoogleMapsAPIWrapper} from './../google-maps-api-wrapper';
+import {Marker} from './../google-maps-types';
 
 @Injectable()
 export class MarkerManager {

diff --git a/src/core/services/managers/polygon-manager.spec.ts b/src/core/services/managers/polygon-manager.spec.ts
@@ -1,10 +1,10 @@
-import { NgZone } from '@angular/core';
-import { TestBed, inject } from '@angular/core/testing';
+import {NgZone} from '@angular/core';
+import {TestBed, inject} from '@angular/core/testing';
 
-import { SebmGoogleMapPolygon } from '../../directives/google-map-polygon';
-import { GoogleMapsAPIWrapper } from '../google-maps-api-wrapper';
-import { Polygon } from '../google-maps-types';
-import { PolygonManager } from './polygon-manager';
+import {SebmGoogleMapPolygon} from '../../directives/google-map-polygon';
+import {GoogleMapsAPIWrapper} from '../google-maps-api-wrapper';
+import {Polygon} from '../google-maps-types';
+import {PolygonManager} from './polygon-manager';
 
 describe('PolygonManager', () => {
   beforeEach(() => {

diff --git a/src/core/services/managers/polygon-manager.ts b/src/core/services/managers/polygon-manager.ts
@@ -1,10 +1,10 @@
-import { Injectable, NgZone } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import {Injectable, NgZone} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
+import {Observer} from 'rxjs/Observer';
 
-import { SebmGoogleMapPolygon } from '../../directives/google-map-polygon';
-import { GoogleMapsAPIWrapper } from '../google-maps-api-wrapper';
-import { Polygon } from '../google-maps-types';
+import {SebmGoogleMapPolygon} from '../../directives/google-map-polygon';
+import {GoogleMapsAPIWrapper} from '../google-maps-api-wrapper';
+import {Polygon} from '../google-maps-types';
 
 @Injectable()
 export class PolygonManager {

diff --git a/src/core/services/managers/polyline-manager.spec.ts b/src/core/services/managers/polyline-manager.spec.ts
@@ -1,10 +1,10 @@
-import { NgZone } from '@angular/core';
-import { TestBed, inject } from '@angular/core/testing';
+import {NgZone} from '@angular/core';
+import {TestBed, inject} from '@angular/core/testing';
 
-import { SebmGoogleMapPolyline } from '../../directives/google-map-polyline';
-import { GoogleMapsAPIWrapper } from '../../services/google-maps-api-wrapper';
-import { Polyline } from '../../services/google-maps-types';
-import { PolylineManager } from '../../services/managers/polyline-manager';
+import {SebmGoogleMapPolyline} from '../../directives/google-map-polyline';
+import {GoogleMapsAPIWrapper} from '../../services/google-maps-api-wrapper';
+import {Polyline} from '../../services/google-maps-types';
+import {PolylineManager} from '../../services/managers/polyline-manager';
 
 describe('PolylineManager', () => {
   beforeEach(() => {

diff --git a/src/core/services/managers/polyline-manager.ts b/src/core/services/managers/polyline-manager.ts
@@ -1,11 +1,11 @@
-import { Injectable, NgZone } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Observer } from 'rxjs/Observer';
+import {Injectable, NgZone} from '@angular/core';
+import {Observable} from 'rxjs/Observable';
+import {Observer} from 'rxjs/Observer';
 
-import { SebmGoogleMapPolyline } from '../../directives/google-map-polyline';
-import { SebmGoogleMapPolylinePoint } from '../../directives/google-map-polyline-point';
-import { GoogleMapsAPIWrapper } from '../google-maps-api-wrapper';
-import { LatLngLiteral, Polyline } from '../google-maps-types';
+import {SebmGoogleMapPolyline} from '../../directives/google-map-polyline';
+import {SebmGoogleMapPolylinePoint} from '../../directives/google-map-polyline-point';
+import {GoogleMapsAPIWrapper} from '../google-maps-api-wrapper';
+import {LatLngLiteral, Polyline} from '../google-maps-types';
 
 @Injectable()
 export class PolylineManager {

diff --git a/src/core/services/maps-api-loader/lazy-maps-api-loader.spec.ts b/src/core/services/maps-api-loader/lazy-maps-api-loader.spec.ts
@@ -1,9 +1,9 @@
-import { TestBed, inject } from '@angular/core/testing';
+import {TestBed, inject} from '@angular/core/testing';
 
-import { DocumentRef, WindowRef } from '../../utils/browser-globals';
+import {DocumentRef, WindowRef} from '../../utils/browser-globals';
 
-import { GoogleMapsScriptProtocol, LAZY_MAPS_API_CONFIG, LazyMapsAPILoader, LazyMapsAPILoaderConfigLiteral } from './lazy-maps-api-loader';
-import { MapsAPILoader } from './maps-api-loader';
+import {GoogleMapsScriptProtocol, LAZY_MAPS_API_CONFIG, LazyMapsAPILoader, LazyMapsAPILoaderConfigLiteral} from './lazy-maps-api-loader';
+import {MapsAPILoader} from './maps-api-loader';
 
 describe('Service: LazyMapsAPILoader', () => {
   let documentRef: DocumentRef;

diff --git a/src/core/services/maps-api-loader/lazy-maps-api-loader.ts b/src/core/services/maps-api-loader/lazy-maps-api-loader.ts
@@ -1,8 +1,8 @@
-import { Inject, Injectable, OpaqueToken } from '@angular/core';
+import {Inject, Injectable, OpaqueToken} from '@angular/core';
 
-import { DocumentRef, WindowRef } from '../../utils/browser-globals';
+import {DocumentRef, WindowRef} from '../../utils/browser-globals';
 
-import { MapsAPILoader } from './maps-api-loader';
+import {MapsAPILoader} from './maps-api-loader';
 
 export enum GoogleMapsScriptProtocol {
   HTTP = 1,

diff --git a/src/core/services/maps-api-loader/maps-api-loader.ts b/src/core/services/maps-api-loader/maps-api-loader.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import {Injectable} from '@angular/core';
 
 @Injectable()
 export abstract class MapsAPILoader {

diff --git a/src/core/services/maps-api-loader/noop-maps-api-loader.ts b/src/core/services/maps-api-loader/noop-maps-api-loader.ts
@@ -1,4 +1,4 @@
-import { MapsAPILoader } from './maps-api-loader';
+import {MapsAPILoader} from './maps-api-loader';
 
 /**
  * When using the NoOpMapsAPILoader, the Google Maps API must be added to the page via a `<script>`

diff --git a/src/core/utils/browser-globals.ts b/src/core/utils/browser-globals.ts
@@ -1,4 +1,4 @@
-import { Provider } from '@angular/core';
+import {Provider} from '@angular/core';
 
 export class WindowRef {
   getNativeWindow(): any { return window; }

diff --git a/tslint.json b/tslint.json
@@ -10,7 +10,7 @@
     ],
     "curly": true,
     "eofline": true,
-    "indent": "spaces",
+    "indent": [true, "spaces"],
     "jsdoc-format": true,
     "member-ordering": [
       true,
@@ -52,7 +52,6 @@
       true,
       "parameter",
       "property-declaration",
-      "variable-delcaration",
       "member-variable-declaration"
     ],
     "typedef-whitespace": [
@@ -93,7 +92,7 @@
     "use-life-cycle-interface": true,
     "use-pipe-transform-interface": true,
     "pipe-naming": [true, "camelCase", "sebm"],
-    "import-destructuring-spacing": true,
+    "import-destructuring-spacing": false,
     "templates-use-public": true,
     "no-access-missing-member": true,
     "invoke-injectable": true