mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-02-13 06:20:23 -06:00
Update baseline from merging master
This commit is contained in:
parent
4b886b3444
commit
ce2495f398
@ -20,7 +20,7 @@ var Based = (function () {
|
||||
function Based() {
|
||||
}
|
||||
return Based;
|
||||
})();
|
||||
}());
|
||||
var Derived = (function (_super) {
|
||||
__extends(Derived, _super);
|
||||
function Derived() {
|
||||
@ -30,4 +30,4 @@ var Derived = (function (_super) {
|
||||
var that = this;
|
||||
}
|
||||
return Derived;
|
||||
})(Based);
|
||||
}(Based));
|
||||
|
||||
@ -20,7 +20,7 @@ var Based = (function () {
|
||||
function Based() {
|
||||
}
|
||||
return Based;
|
||||
})();
|
||||
}());
|
||||
var Derived = (function (_super) {
|
||||
__extends(Derived, _super);
|
||||
function Derived() {
|
||||
@ -30,4 +30,4 @@ var Derived = (function (_super) {
|
||||
var that = this;
|
||||
}
|
||||
return Derived;
|
||||
})(Based);
|
||||
}(Based));
|
||||
|
||||
@ -25,7 +25,7 @@ var Based = (function () {
|
||||
function Based() {
|
||||
}
|
||||
return Based;
|
||||
})();
|
||||
}());
|
||||
var Derived = (function (_super) {
|
||||
__extends(Derived, _super);
|
||||
function Derived() {
|
||||
@ -34,10 +34,10 @@ var Derived = (function (_super) {
|
||||
this.y = true;
|
||||
}
|
||||
return innver;
|
||||
})();
|
||||
}());
|
||||
_super.call(this);
|
||||
this.x = 10;
|
||||
var that = this;
|
||||
}
|
||||
return Derived;
|
||||
})(Based);
|
||||
}(Based));
|
||||
|
||||
@ -29,7 +29,7 @@ var Based = (function () {
|
||||
function Based() {
|
||||
}
|
||||
return Based;
|
||||
})();
|
||||
}());
|
||||
var Derived = (function (_super) {
|
||||
__extends(Derived, _super);
|
||||
function Derived() {
|
||||
@ -49,4 +49,4 @@ var Derived = (function (_super) {
|
||||
var that = this;
|
||||
}
|
||||
return Derived;
|
||||
})(Based);
|
||||
}(Based));
|
||||
|
||||
@ -21,11 +21,11 @@ var Based = (function () {
|
||||
}
|
||||
}
|
||||
return Based;
|
||||
})();
|
||||
}());
|
||||
var Derived = (function (_super) {
|
||||
__extends(Derived, _super);
|
||||
function Derived() {
|
||||
_super.call(this, this.x);
|
||||
}
|
||||
return Derived;
|
||||
})(Based);
|
||||
}(Based));
|
||||
|
||||
@ -24,7 +24,7 @@ var Base = (function () {
|
||||
}
|
||||
}
|
||||
return Base;
|
||||
})();
|
||||
}());
|
||||
var Super = (function (_super) {
|
||||
__extends(Super, _super);
|
||||
function Super() {
|
||||
@ -33,4 +33,4 @@ var Super = (function (_super) {
|
||||
_super.call(this);
|
||||
}
|
||||
return Super;
|
||||
})(Base);
|
||||
}(Base));
|
||||
|
||||
@ -19,7 +19,7 @@ var Base = (function () {
|
||||
function Base(func) {
|
||||
}
|
||||
return Base;
|
||||
})();
|
||||
}());
|
||||
var Super = (function (_super) {
|
||||
__extends(Super, _super);
|
||||
function Super() {
|
||||
@ -27,4 +27,4 @@ var Super = (function (_super) {
|
||||
_super.call(this, (function () { return _this; })); // No error
|
||||
}
|
||||
return Super;
|
||||
})(Base);
|
||||
}(Base));
|
||||
|
||||
@ -24,7 +24,7 @@ var Base = (function () {
|
||||
}
|
||||
}
|
||||
return Base;
|
||||
})();
|
||||
}());
|
||||
var Super = (function (_super) {
|
||||
__extends(Super, _super);
|
||||
function Super() {
|
||||
@ -32,4 +32,4 @@ var Super = (function (_super) {
|
||||
_super.call(this);
|
||||
}
|
||||
return Super;
|
||||
})(Base);
|
||||
}(Base));
|
||||
|
||||
@ -78,4 +78,4 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod
|
||||
|
||||
export = this; // Should be an error
|
||||
~~~~~~~~~~~~~~
|
||||
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
|
||||
!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.
|
||||
Loading…
x
Reference in New Issue
Block a user