Skip to content

Commit

Permalink
Merge pull request #13945 from Microsoft/upateLKGrelease-2.1
Browse files Browse the repository at this point in the history 
Update LKG
  • Loading branch information
@mhegazy
mhegazy authored Feb 8, 2017
2 parents 54220a8 + 064a997 commit 496e7ab
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 15 deletions.
7 changes: 5 additions & 2 deletions lib/tsc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.1.5";
ts.version = "2.1.6";
})(ts || (ts = {}));
(function (ts) {
var createObject = Object.create;
Expand Down Expand Up @@ -2256,7 +2256,7 @@ var ts;
},
watchDirectory: function (directoryName, callback, recursive) {
var options;
if (!directoryExists(directoryName)) {
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
return noOpFileWatcher;
}
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
Expand All @@ -2271,6 +2271,9 @@ var ts;
}
;
});
function isUNCPath(s) {
return s.length > 2 && s.charCodeAt(0) === 47 && s.charCodeAt(1) === 47;
}
},
resolvePath: function (path) {
return _path.resolve(path);
Expand Down
7 changes: 5 additions & 2 deletions lib/tsserver.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.1.5";
ts.version = "2.1.6";
})(ts || (ts = {}));
(function (ts) {
var createObject = Object.create;
Expand Down Expand Up @@ -2261,7 +2261,7 @@ var ts;
},
watchDirectory: function (directoryName, callback, recursive) {
var options;
if (!directoryExists(directoryName)) {
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
return noOpFileWatcher;
}
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
Expand All @@ -2276,6 +2276,9 @@ var ts;
}
;
});
function isUNCPath(s) {
return s.length > 2 && s.charCodeAt(0) === 47 && s.charCodeAt(1) === 47;
}
},
resolvePath: function (path) {
return _path.resolve(path);
Expand Down
2 changes: 1 addition & 1 deletion lib/tsserverlibrary.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3584,7 +3584,7 @@ declare namespace ts.performance {
function disable(): void;
}
declare namespace ts {
const version = "2.1.5";
const version = "2.1.6";
}
declare namespace ts {
const enum Ternary {
Expand Down
7 changes: 5 additions & 2 deletions lib/tsserverlibrary.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.1.5";
ts.version = "2.1.6";
})(ts || (ts = {}));
(function (ts) {
var createObject = Object.create;
Expand Down Expand Up @@ -2261,7 +2261,7 @@ var ts;
},
watchDirectory: function (directoryName, callback, recursive) {
var options;
if (!directoryExists(directoryName)) {
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
return noOpFileWatcher;
}
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
Expand All @@ -2276,6 +2276,9 @@ var ts;
}
;
});
function isUNCPath(s) {
return s.length > 2 && s.charCodeAt(0) === 47 && s.charCodeAt(1) === 47;
}
},
resolvePath: function (path) {
return _path.resolve(path);
Expand Down
2 changes: 1 addition & 1 deletion lib/typescript.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2148,7 +2148,7 @@ declare namespace ts {
}
declare namespace ts {
/** The version of the TypeScript compiler release */
const version = "2.1.5";
const version = "2.1.6";
}
declare namespace ts {
type FileWatcherCallback = (fileName: string, removed?: boolean) => void;
Expand Down
10 changes: 8 additions & 2 deletions lib/typescript.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ var ts;
var ts;
(function (ts) {
/** The version of the TypeScript compiler release */
ts.version = "2.1.5";
ts.version = "2.1.6";
})(ts || (ts = {}));
/* @internal */
(function (ts) {
Expand Down Expand Up @@ -3688,7 +3688,10 @@ var ts;
// Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
// (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
var options;
if (!directoryExists(directoryName)) {
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
// do nothing if either
// - target folder does not exist
// - this is UNC path on Windows (https://github.com/Microsoft/TypeScript/issues/13874)
return noOpFileWatcher;
}
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
Expand All @@ -3707,6 +3710,9 @@ var ts;
}
;
});
function isUNCPath(s) {
return s.length > 2 && s.charCodeAt(0) === 47 /* slash */ && s.charCodeAt(1) === 47 /* slash */;
}
},
resolvePath: function (path) {
return _path.resolve(path);
Expand Down
2 changes: 1 addition & 1 deletion lib/typescriptServices.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2148,7 +2148,7 @@ declare namespace ts {
}
declare namespace ts {
/** The version of the TypeScript compiler release */
const version = "2.1.5";
const version = "2.1.6";
}
declare namespace ts {
type FileWatcherCallback = (fileName: string, removed?: boolean) => void;
Expand Down
10 changes: 8 additions & 2 deletions lib/typescriptServices.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ var ts;
var ts;
(function (ts) {
/** The version of the TypeScript compiler release */
ts.version = "2.1.5";
ts.version = "2.1.6";
})(ts || (ts = {}));
/* @internal */
(function (ts) {
Expand Down Expand Up @@ -3688,7 +3688,10 @@ var ts;
// Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
// (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
var options;
if (!directoryExists(directoryName)) {
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
// do nothing if either
// - target folder does not exist
// - this is UNC path on Windows (https://github.com/Microsoft/TypeScript/issues/13874)
return noOpFileWatcher;
}
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
Expand All @@ -3707,6 +3710,9 @@ var ts;
}
;
});
function isUNCPath(s) {
return s.length > 2 && s.charCodeAt(0) === 47 /* slash */ && s.charCodeAt(1) === 47 /* slash */;
}
},
resolvePath: function (path) {
return _path.resolve(path);
Expand Down
7 changes: 5 additions & 2 deletions lib/typingsInstaller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ var ts;
})(ts || (ts = {}));
var ts;
(function (ts) {
ts.version = "2.1.5";
ts.version = "2.1.6";
})(ts || (ts = {}));
(function (ts) {
var createObject = Object.create;
Expand Down Expand Up @@ -2261,7 +2261,7 @@ var ts;
},
watchDirectory: function (directoryName, callback, recursive) {
var options;
if (!directoryExists(directoryName)) {
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
return noOpFileWatcher;
}
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
Expand All @@ -2276,6 +2276,9 @@ var ts;
}
;
});
function isUNCPath(s) {
return s.length > 2 && s.charCodeAt(0) === 47 && s.charCodeAt(1) === 47;
}
},
resolvePath: function (path) {
return _path.resolve(path);
Expand Down

0 comments on commit 496e7ab

Please sign in to comment.