mirror of
https://github.com/microsoft/TypeScript.git
synced 2025-11-18 17:21:48 +00:00
Merge branch 'master' into noImplicitAnyOnCast
This commit is contained in:
Mohamed Hegazy
@@ -33,6 +33,6 @@ declare module "SubModule" {
|
||||
}
|
||||
}
|
||||
//// [declFileAmbientExternalModuleWithSingleExportedModule_1.d.ts]
|
||||
/// <reference path='declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts' />
|
||||
/// <reference path="declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts" />
|
||||
import SubModule = require('SubModule');
|
||||
export declare var x: SubModule.m.m3.c;
|
||||
|
||||
@@ -24,6 +24,6 @@ var z = exports.b.x;
|
||||
//// [declFileForExportedImport_0.d.ts]
|
||||
export declare var x: number;
|
||||
//// [declFileForExportedImport_1.d.ts]
|
||||
/// <reference path='declFileForExportedImport_0.d.ts' />
|
||||
/// <reference path="declFileForExportedImport_0.d.ts" />
|
||||
export import a = require('declFileForExportedImport_0');
|
||||
export import b = a;
|
||||
|
||||
@@ -73,6 +73,6 @@ declare function b1(): typeof b1;
|
||||
declare function foo(): typeof foo;
|
||||
declare var foo1: typeof foo;
|
||||
declare var foo2: typeof foo;
|
||||
declare var foo3: any;
|
||||
declare var x: any;
|
||||
declare var foo3: () => any;
|
||||
declare var x: () => any;
|
||||
declare function foo5(x: number): (x: number) => number;
|
||||
|
||||
@@ -54,18 +54,18 @@ var foo2 = foo;
|
||||
>foo : () => typeof foo
|
||||
|
||||
var foo3 = function () {
|
||||
>foo3 : any
|
||||
>foo3 : () => any
|
||||
>function () { return foo3;} : () => any
|
||||
|
||||
return foo3;
|
||||
>foo3 : any
|
||||
>foo3 : () => any
|
||||
}
|
||||
var x = () => {
|
||||
>x : any
|
||||
>x : () => any
|
||||
>() => { return x;} : () => any
|
||||
|
||||
return x;
|
||||
>x : any
|
||||
>x : () => any
|
||||
}
|
||||
|
||||
function foo5(x: number) {
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
//// [declarationEmit_invalidReference.ts]
|
||||
/// <reference path="invalid.ts" />
|
||||
var x = 0;
|
||||
|
||||
//// [declarationEmit_invalidReference.js]
|
||||
/// <reference path="invalid.ts" />
|
||||
var x = 0;
|
||||
|
||||
|
||||
//// [declarationEmit_invalidReference.d.ts]
|
||||
declare var x: number;
|
||||
@@ -0,0 +1,5 @@
|
||||
=== tests/cases/compiler/declarationEmit_invalidReference.ts ===
|
||||
/// <reference path="invalid.ts" />
|
||||
var x = 0;
|
||||
>x : number
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
==== tests/cases/compiler/declarationEmit_invalidReference2.ts (1 errors) ====
|
||||
/// <reference path="invalid.ts" />
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
!!! File 'invalid.ts' not found.
|
||||
var x = 0;
|
||||
@@ -1,4 +1,4 @@
|
||||
==== tests/cases/compiler/defaultArgsForwardReferencing.ts (12 errors) ====
|
||||
==== tests/cases/compiler/defaultArgsForwardReferencing.ts (10 errors) ====
|
||||
function left(a, b = a, c = b) {
|
||||
a;
|
||||
b;
|
||||
@@ -37,11 +37,7 @@
|
||||
}
|
||||
|
||||
function defaultArgFunction(a = function () { return b; }, b = 1) { }
|
||||
~
|
||||
!!! Initializer of parameter 'a' cannot reference identifier 'b' declared after it.
|
||||
function defaultArgArrow(a = () => () => b, b = 3) { }
|
||||
~
|
||||
!!! Initializer of parameter 'a' cannot reference identifier 'b' declared after it.
|
||||
|
||||
class C {
|
||||
constructor(a = b, b = 1) { }
|
||||
|
||||
@@ -205,11 +205,11 @@ export declare function foo(): d;
|
||||
import m4 = require("importDecl_require");
|
||||
export declare function foo2(): m4.d;
|
||||
//// [importDecl_1.d.ts]
|
||||
/// <reference path='importDecl_require.d.ts' />
|
||||
/// <reference path='importDecl_require1.d.ts' />
|
||||
/// <reference path='importDecl_require2.d.ts' />
|
||||
/// <reference path='importDecl_require3.d.ts' />
|
||||
/// <reference path='importDecl_require4.d.ts' />
|
||||
/// <reference path="importDecl_require.d.ts" />
|
||||
/// <reference path="importDecl_require1.d.ts" />
|
||||
/// <reference path="importDecl_require2.d.ts" />
|
||||
/// <reference path="importDecl_require3.d.ts" />
|
||||
/// <reference path="importDecl_require4.d.ts" />
|
||||
import m4 = require("importDecl_require");
|
||||
export declare var x4: m4.d;
|
||||
export declare var d4: typeof m4.d;
|
||||
|
||||
@@ -27,6 +27,6 @@ export declare class B {
|
||||
id: number;
|
||||
}
|
||||
//// [importDeclarationUsedAsTypeQuery_1.d.ts]
|
||||
/// <reference path='importDeclarationUsedAsTypeQuery_require.d.ts' />
|
||||
/// <reference path="importDeclarationUsedAsTypeQuery_require.d.ts" />
|
||||
import a = require('importDeclarationUsedAsTypeQuery_require');
|
||||
export declare var x: typeof a;
|
||||
|
||||
@@ -43,7 +43,7 @@ declare module "SubModule" {
|
||||
export = SubModule;
|
||||
}
|
||||
//// [missingImportAfterModuleImport_1.d.ts]
|
||||
/// <reference path='missingImportAfterModuleImport_0.d.ts' />
|
||||
/// <reference path="missingImportAfterModuleImport_0.d.ts" />
|
||||
import SubModule = require('SubModule');
|
||||
declare class MainModule {
|
||||
SubModule: SubModule;
|
||||
|
||||
@@ -35,7 +35,7 @@ declare module A {
|
||||
}
|
||||
}
|
||||
//// [B.d.ts]
|
||||
/// <reference path='A.d.ts' />
|
||||
/// <reference path="A.d.ts" />
|
||||
declare module A {
|
||||
}
|
||||
declare module B {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
=== tests/cases/compiler/namedFunctionExpressionCall.ts ===
|
||||
var recurser = function foo() {
|
||||
>recurser : any
|
||||
>recurser : () => void
|
||||
>function foo() { // using the local name foo(); // using the globally visible name recurser();} : () => void
|
||||
>foo : () => void
|
||||
|
||||
@@ -11,8 +11,8 @@ var recurser = function foo() {
|
||||
|
||||
// using the globally visible name
|
||||
recurser();
|
||||
>recurser() : any
|
||||
>recurser : any
|
||||
>recurser() : void
|
||||
>recurser : () => void
|
||||
|
||||
};
|
||||
|
||||
|
||||
+3
-1
@@ -1,4 +1,4 @@
|
||||
==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts (1 errors) ====
|
||||
==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserStatementIsNotAMemberVariableDeclaration1.ts (2 errors) ====
|
||||
return {
|
||||
~~~~~~
|
||||
!!! A 'return' statement can only be used within a function body.
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
// 'private' should not be considered a member variable here.
|
||||
private[key] = value;
|
||||
~~~~~~~
|
||||
!!! Cannot find name 'private'.
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -402,7 +402,7 @@ export declare module SpecializedWidget {
|
||||
function createWidget2(): Widget2;
|
||||
}
|
||||
//// [privacyCannotNameAccessorDeclFile_exporter.d.ts]
|
||||
/// <reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts' />
|
||||
/// <reference path="privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts" />
|
||||
import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
|
||||
import Widgets1 = require("GlobalWidgets");
|
||||
export declare function createExportedWidget1(): Widgets.Widget1;
|
||||
|
||||
@@ -230,7 +230,7 @@ export declare module SpecializedWidget {
|
||||
function createWidget2(): Widget2;
|
||||
}
|
||||
//// [privacyCannotNameVarTypeDeclFile_exporter.d.ts]
|
||||
/// <reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts' />
|
||||
/// <reference path="privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts" />
|
||||
import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
|
||||
import Widgets1 = require("GlobalWidgets");
|
||||
export declare function createExportedWidget1(): Widgets.Widget1;
|
||||
|
||||
@@ -416,7 +416,7 @@ export declare module SpecializedWidget {
|
||||
function createWidget2(): Widget2;
|
||||
}
|
||||
//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.d.ts]
|
||||
/// <reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts' />
|
||||
/// <reference path="privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts" />
|
||||
import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
|
||||
import Widgets1 = require("GlobalWidgets");
|
||||
export declare function createExportedWidget1(): Widgets.Widget1;
|
||||
|
||||
@@ -373,7 +373,7 @@ export declare module SpecializedWidget {
|
||||
function createWidget2(): Widget2;
|
||||
}
|
||||
//// [privacyFunctionReturnTypeDeclFile_exporter.d.ts]
|
||||
/// <reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts' />
|
||||
/// <reference path="privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts" />
|
||||
import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
|
||||
import Widgets1 = require("GlobalWidgets");
|
||||
export declare function createExportedWidget1(): Widgets.Widget1;
|
||||
|
||||
@@ -105,8 +105,8 @@ export declare class c_public {
|
||||
bar: string;
|
||||
}
|
||||
//// [privacyTopLevelAmbientExternalModuleImportWithExport_core.d.ts]
|
||||
/// <reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts' />
|
||||
/// <reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.d.ts' />
|
||||
/// <reference path="privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts" />
|
||||
/// <reference path="privacyTopLevelAmbientExternalModuleImportWithExport_require3.d.ts" />
|
||||
export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
|
||||
export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
|
||||
export import im_public_mi_public = require("m");
|
||||
|
||||
+2
-2
@@ -104,8 +104,8 @@ export declare class c_public {
|
||||
bar: string;
|
||||
}
|
||||
//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.d.ts]
|
||||
/// <reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts' />
|
||||
/// <reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.d.ts' />
|
||||
/// <reference path="privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts" />
|
||||
/// <reference path="privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.d.ts" />
|
||||
import im_private_mi_private = require("m");
|
||||
import im_private_mu_private = require("m2");
|
||||
import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../ref/m2.d.ts' />
|
||||
/// <reference path="../ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../ref/m2.d.ts' />
|
||||
/// <reference path="../ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
|
||||
/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
|
||||
/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../ref/m2.d.ts' />
|
||||
/// <reference path="../ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../ref/m2.d.ts' />
|
||||
/// <reference path="../ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
|
||||
/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
|
||||
/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../ref/m2.d.ts' />
|
||||
/// <reference path="../ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../ref/m2.d.ts' />
|
||||
/// <reference path="../ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
|
||||
/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
|
||||
/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
Vendored
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
Vendored
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../ref/m2.d.ts' />
|
||||
/// <reference path="../ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../ref/m2.d.ts' />
|
||||
/// <reference path="../ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
|
||||
/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='../outdir/outAndOutDirFolder/ref/m2.d.ts' />
|
||||
/// <reference path="../outdir/outAndOutDirFolder/ref/m2.d.ts" />
|
||||
declare var m1_a1: number;
|
||||
declare class m1_c1 {
|
||||
m1_c1_p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
Vendored
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path='../outputdir_multifolder_ref/m2.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
/// <reference path="../outputdir_multifolder_ref/m2.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='m1.d.ts' />
|
||||
/// <reference path="m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/// <reference path='ref/m1.d.ts' />
|
||||
/// <reference path="ref/m1.d.ts" />
|
||||
declare var a1: number;
|
||||
declare class c1 {
|
||||
p1: number;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user