Merge remote-tracking branch 'origin/master'

FAQ.md

@@ -655,7 +655,7 @@ class Bravo { x: number }
 class Charlie { private x: number }
 class Delta { private x: number }
 
-let a = new Alpha(), b = new Beta(), c = new Charlie(), d = new Delta();
+let a = new Alpha(), b = new Bravo(), c = new Charlie(), d = new Delta();
 
 a = b; // OK
 c = d; // Error

JSDoc-support-in-JavaScript.md

@@ -63,7 +63,7 @@ var var8;
 /** @type {{a: string, b: number}} */
 var var9;
 
-// "@typedef" maybe used to define complex types
+// "@typedef" may be used to define complex types
 /**
  * @typedef {Object} SpecialType - creates a new type named 'SpecialType'
  * @property {string} prop1 - a string property of SpecialType

What's-new-in-TypeScript.md

@@ -437,9 +437,9 @@ For example, this `Options` type is a weak type:
 
 ```ts
 interface Options {
-    data?: string,
-    timeout?: number,
-    maxRetries?: number,
+    data?: string;
+    timeout?: number;
+    maxRetries?: number;
 }
 ```
 

Writing-a-Language-Service-Plugin.md

@@ -102,7 +102,7 @@ function create(info: ts.server.PluginCreateInfo) {
     // Get a list of things to remove from the completion list from the config object.
     // If nothing was specified, we'll just remove 'caller'
     const whatToRemove: string[] = info.config.remove || ['caller'];
-    
+
     // ... (set up decorator here) ...
 
     // Remove specified entries from completion list
@@ -209,4 +209,5 @@ Some other TypeScript Language Service Plugin implementations you can look at fo
 
 * https://github.com/angular/angular/blob/master/packages/language-service/src/ts_plugin.ts
 * https://github.com/Quramy/ts-graphql-plugin
-* https://github.com/Microsoft/typescript-styled-plugin
+* https://github.com/Microsoft/typescript-styled-plugin
+* https://github.com/angelozerr/tslint-language-service/