Merge branch 'master' into preserveFormatting

Conflicts:
	tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.js

src/compiler/program.ts

@@ -5,6 +5,9 @@ module ts {
     /* @internal */ export var emitTime = 0;
     /* @internal */ export var ioReadTime = 0;
 
+    /** The version of the TypeScript compiler release */
+    export var version = "1.5.0.0";
+
     export function createCompilerHost(options: CompilerOptions): CompilerHost {
         var currentDirectory: string;
         var existingDirectories: Map<boolean> = {};

src/compiler/tsc.ts

@@ -2,8 +2,6 @@
 /// <reference path="commandLineParser.ts"/>
 
 module ts {
-    var version = "1.5.0.0";
-
     export interface SourceFile {
         fileWatcher: FileWatcher;
     }
@@ -178,7 +176,7 @@ module ts {
         }
 
         if (commandLine.options.version) {
-            reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, version));
+            reportDiagnostic(createCompilerDiagnostic(Diagnostics.Version_0, ts.version));
             return sys.exit(ExitStatus.Success);
         }
 
@@ -419,7 +417,7 @@ module ts {
     }
 
     function printVersion() {
-        sys.write(getDiagnosticText(Diagnostics.Version_0, version) + sys.newLine);
+        sys.write(getDiagnosticText(Diagnostics.Version_0, ts.version) + sys.newLine);
     }
 
     function printHelp() {

src/compiler/utilities.ts

@@ -1174,7 +1174,7 @@ module ts {
     }
 
     export function nodeIsSynthesized(node: Node): boolean {
-        return node.pos === -1 && node.end === -1;
+        return node.pos === -1;
     }
 
     export function createSynthesizedNode(kind: SyntaxKind, startsOnNewLine?: boolean): Node {

src/lib/core.d.ts

@@ -410,6 +410,9 @@ interface String {
       */
     substr(from: number, length?: number): string;
 
+    /** Returns the primitive value of the specified object. */
+    valueOf(): string;
+
     [index: number]: string;
 }
 
@@ -462,6 +465,9 @@ interface Number {
       * @param precision Number of significant digits. Must be in the range 1 - 21, inclusive.
       */
     toPrecision(precision?: number): string;
+
+    /** Returns the primitive value of the specified object. */
+    valueOf(): number;
 }
 
 interface NumberConstructor {

src/services/services.ts

@@ -11,6 +11,7 @@
 /// <reference path='formatting\smartIndenter.ts' />
 
 module ts {
+    /** The version of the language service API */
     export var servicesVersion = "0.4"
 
     export interface Node {