Skip to content

Commit 510b384

Browse files
mhegazymhegazy
committed
Update LKG
1 parent 08fe20e commit 510b384

10 files changed

+211
-54
lines changed

‎lib/tsc.js

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2025,6 +2025,21 @@ var ts;
20252025
})(ts || (ts = {}));
20262026
var ts;
20272027
(function (ts) {
2028+
function getNodeMajorVersion() {
2029+
if (typeof process === "undefined") {
2030+
return undefined;
2031+
}
2032+
var version = process.version;
2033+
if (!version) {
2034+
return undefined;
2035+
}
2036+
var dot = version.indexOf(".");
2037+
if (dot === -1) {
2038+
return undefined;
2039+
}
2040+
return parseInt(version.substring(1, dot));
2041+
}
2042+
ts.getNodeMajorVersion = getNodeMajorVersion;
20282043
ts.sys = (function () {
20292044
function getWScriptSystem() {
20302045
var fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -2215,9 +2230,8 @@ var ts;
22152230
}
22162231
}
22172232
var watchedFileSet = createWatchedFileSet();
2218-
function isNode4OrLater() {
2219-
return parseInt(process.version.charAt(1)) >= 4;
2220-
}
2233+
var nodeVersion = getNodeMajorVersion();
2234+
var isNode4OrLater = nodeVersion >= 4;
22212235
function isFileSystemCaseSensitive() {
22222236
if (platform === "win32" || platform === "win64") {
22232237
return false;
@@ -2351,10 +2365,10 @@ var ts;
23512365
},
23522366
watchDirectory: function (directoryName, callback, recursive) {
23532367
var options;
2354-
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
2368+
if (!directoryExists(directoryName)) {
23552369
return noOpFileWatcher;
23562370
}
2357-
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
2371+
if (isNode4OrLater && (process.platform === "win32" || process.platform === "darwin")) {
23582372
options = { persistent: true, recursive: !!recursive };
23592373
}
23602374
else {
@@ -2366,9 +2380,6 @@ var ts;
23662380
}
23672381
;
23682382
});
2369-
function isUNCPath(s) {
2370-
return s.length > 2 && s.charCodeAt(0) === 47 && s.charCodeAt(1) === 47;
2371-
}
23722383
},
23732384
resolvePath: function (path) {
23742385
return _path.resolve(path);

‎lib/tsserver.js

Lines changed: 84 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,6 +2981,21 @@ var ts;
29812981
})(ts || (ts = {}));
29822982
var ts;
29832983
(function (ts) {
2984+
function getNodeMajorVersion() {
2985+
if (typeof process === "undefined") {
2986+
return undefined;
2987+
}
2988+
var version = process.version;
2989+
if (!version) {
2990+
return undefined;
2991+
}
2992+
var dot = version.indexOf(".");
2993+
if (dot === -1) {
2994+
return undefined;
2995+
}
2996+
return parseInt(version.substring(1, dot));
2997+
}
2998+
ts.getNodeMajorVersion = getNodeMajorVersion;
29842999
ts.sys = (function () {
29853000
function getWScriptSystem() {
29863001
var fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -3171,9 +3186,8 @@ var ts;
31713186
}
31723187
}
31733188
var watchedFileSet = createWatchedFileSet();
3174-
function isNode4OrLater() {
3175-
return parseInt(process.version.charAt(1)) >= 4;
3176-
}
3189+
var nodeVersion = getNodeMajorVersion();
3190+
var isNode4OrLater = nodeVersion >= 4;
31773191
function isFileSystemCaseSensitive() {
31783192
if (platform === "win32" || platform === "win64") {
31793193
return false;
@@ -3312,10 +3326,10 @@ var ts;
33123326
},
33133327
watchDirectory: function (directoryName, callback, recursive) {
33143328
var options;
3315-
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
3329+
if (!directoryExists(directoryName)) {
33163330
return noOpFileWatcher;
33173331
}
3318-
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
3332+
if (isNode4OrLater && (process.platform === "win32" || process.platform === "darwin")) {
33193333
options = { persistent: true, recursive: !!recursive };
33203334
}
33213335
else {
@@ -3327,9 +3341,6 @@ var ts;
33273341
}
33283342
;
33293343
});
3330-
function isUNCPath(s) {
3331-
return s.length > 2 && s.charCodeAt(0) === 47 && s.charCodeAt(1) === 47;
3332-
}
33333344
},
33343345
resolvePath: function (path) {
33353346
return _path.resolve(path);
@@ -74540,7 +74551,72 @@ var ts;
7454074551
writeMessage(pending.shift());
7454174552
}
7454274553
}
74554+
function extractWatchDirectoryCacheKey(path, currentDriveKey) {
74555+
path = ts.normalizeSlashes(path);
74556+
if (isUNCPath(path)) {
74557+
var firstSlash = path.indexOf(ts.directorySeparator, 2);
74558+
return firstSlash !== -1 ? path.substring(0, firstSlash).toLowerCase() : path;
74559+
}
74560+
var rootLength = ts.getRootLength(path);
74561+
if (rootLength === 0) {
74562+
return currentDriveKey;
74563+
}
74564+
if (path.charCodeAt(1) === 58 && path.charCodeAt(2) === 47) {
74565+
return path.charAt(0).toLowerCase();
74566+
}
74567+
if (path.charCodeAt(0) === 47 && path.charCodeAt(1) !== 47) {
74568+
return currentDriveKey;
74569+
}
74570+
return undefined;
74571+
}
74572+
function isUNCPath(s) {
74573+
return s.length > 2 && s.charCodeAt(0) === 47 && s.charCodeAt(1) === 47;
74574+
}
7454374575
var sys = ts.sys;
74576+
var useWatchGuard = process.platform === "win32" && ts.getNodeMajorVersion() >= 4;
74577+
if (useWatchGuard) {
74578+
var currentDrive_1 = extractWatchDirectoryCacheKey(sys.resolvePath(sys.getCurrentDirectory()), undefined);
74579+
var statusCache_1 = ts.createMap();
74580+
var originalWatchDirectory_1 = sys.watchDirectory;
74581+
sys.watchDirectory = function (path, callback, recursive) {
74582+
var cacheKey = extractWatchDirectoryCacheKey(path, currentDrive_1);
74583+
var status = cacheKey && statusCache_1.get(cacheKey);
74584+
if (status === undefined) {
74585+
if (logger.hasLevel(server.LogLevel.verbose)) {
74586+
logger.info(cacheKey + " for path " + path + " not found in cache...");
74587+
}
74588+
try {
74589+
var args = [ts.combinePaths(__dirname, "watchGuard.js"), path];
74590+
if (logger.hasLevel(server.LogLevel.verbose)) {
74591+
logger.info("Starting " + process.execPath + " with args " + JSON.stringify(args));
74592+
}
74593+
childProcess.execFileSync(process.execPath, args, { stdio: "ignore", env: { "ELECTRON_RUN_AS_NODE": "1" } });
74594+
status = true;
74595+
if (logger.hasLevel(server.LogLevel.verbose)) {
74596+
logger.info("WatchGuard for path " + path + " returned: OK");
74597+
}
74598+
}
74599+
catch (e) {
74600+
status = false;
74601+
if (logger.hasLevel(server.LogLevel.verbose)) {
74602+
logger.info("WatchGuard for path " + path + " returned: " + e.message);
74603+
}
74604+
}
74605+
if (cacheKey) {
74606+
statusCache_1.set(cacheKey, status);
74607+
}
74608+
}
74609+
else if (logger.hasLevel(server.LogLevel.verbose)) {
74610+
logger.info("watchDirectory for " + path + " uses cached drive information.");
74611+
}
74612+
if (status) {
74613+
return originalWatchDirectory_1.call(sys, path, callback, recursive);
74614+
}
74615+
else {
74616+
return { close: function () { } };
74617+
}
74618+
};
74619+
}
7454474620
sys.write = function (s) { return writeMessage(new Buffer(s, "utf8")); };
7454574621
sys.watchFile = function (fileName, callback) {
7454674622
var watchedFile = pollingWatchedFileSet.addFile(fileName, callback);

‎lib/tsserverlibrary.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,6 +2216,7 @@ declare namespace ts {
22162216
directoryName: string;
22172217
referenceCount: number;
22182218
}
2219+
function getNodeMajorVersion(): number;
22192220
let sys: System;
22202221
}
22212222
declare namespace ts {

‎lib/tsserverlibrary.js

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,6 +2981,21 @@ var ts;
29812981
})(ts || (ts = {}));
29822982
var ts;
29832983
(function (ts) {
2984+
function getNodeMajorVersion() {
2985+
if (typeof process === "undefined") {
2986+
return undefined;
2987+
}
2988+
var version = process.version;
2989+
if (!version) {
2990+
return undefined;
2991+
}
2992+
var dot = version.indexOf(".");
2993+
if (dot === -1) {
2994+
return undefined;
2995+
}
2996+
return parseInt(version.substring(1, dot));
2997+
}
2998+
ts.getNodeMajorVersion = getNodeMajorVersion;
29842999
ts.sys = (function () {
29853000
function getWScriptSystem() {
29863001
var fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -3171,9 +3186,8 @@ var ts;
31713186
}
31723187
}
31733188
var watchedFileSet = createWatchedFileSet();
3174-
function isNode4OrLater() {
3175-
return parseInt(process.version.charAt(1)) >= 4;
3176-
}
3189+
var nodeVersion = getNodeMajorVersion();
3190+
var isNode4OrLater = nodeVersion >= 4;
31773191
function isFileSystemCaseSensitive() {
31783192
if (platform === "win32" || platform === "win64") {
31793193
return false;
@@ -3312,10 +3326,10 @@ var ts;
33123326
},
33133327
watchDirectory: function (directoryName, callback, recursive) {
33143328
var options;
3315-
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
3329+
if (!directoryExists(directoryName)) {
33163330
return noOpFileWatcher;
33173331
}
3318-
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
3332+
if (isNode4OrLater && (process.platform === "win32" || process.platform === "darwin")) {
33193333
options = { persistent: true, recursive: !!recursive };
33203334
}
33213335
else {
@@ -3327,9 +3341,6 @@ var ts;
33273341
}
33283342
;
33293343
});
3330-
function isUNCPath(s) {
3331-
return s.length > 2 && s.charCodeAt(0) === 47 && s.charCodeAt(1) === 47;
3332-
}
33333344
},
33343345
resolvePath: function (path) {
33353346
return _path.resolve(path);

‎lib/typescript.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,6 +2392,7 @@ declare namespace ts {
23922392
directoryName: string;
23932393
referenceCount: number;
23942394
}
2395+
function getNodeMajorVersion(): number;
23952396
let sys: System;
23962397
}
23972398
declare namespace ts {

‎lib/typescript.js

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3428,6 +3428,21 @@ var ts;
34283428
/// <reference path="core.ts"/>
34293429
var ts;
34303430
(function (ts) {
3431+
function getNodeMajorVersion() {
3432+
if (typeof process === "undefined") {
3433+
return undefined;
3434+
}
3435+
var version = process.version;
3436+
if (!version) {
3437+
return undefined;
3438+
}
3439+
var dot = version.indexOf(".");
3440+
if (dot === -1) {
3441+
return undefined;
3442+
}
3443+
return parseInt(version.substring(1, dot));
3444+
}
3445+
ts.getNodeMajorVersion = getNodeMajorVersion;
34313446
ts.sys = (function () {
34323447
function getWScriptSystem() {
34333448
var fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -3628,9 +3643,8 @@ var ts;
36283643
}
36293644
}
36303645
var watchedFileSet = createWatchedFileSet();
3631-
function isNode4OrLater() {
3632-
return parseInt(process.version.charAt(1)) >= 4;
3633-
}
3646+
var nodeVersion = getNodeMajorVersion();
3647+
var isNode4OrLater = nodeVersion >= 4;
36343648
function isFileSystemCaseSensitive() {
36353649
// win32\win64 are case insensitive platforms
36363650
if (platform === "win32" || platform === "win64") {
@@ -3782,13 +3796,11 @@ var ts;
37823796
// Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
37833797
// (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
37843798
var options;
3785-
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
3786-
// do nothing if either
3787-
// - target folder does not exist
3788-
// - this is UNC path on Windows (https://github.com/Microsoft/TypeScript/issues/13874)
3799+
if (!directoryExists(directoryName)) {
3800+
// do nothing if target folder does not exist
37893801
return noOpFileWatcher;
37903802
}
3791-
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
3803+
if (isNode4OrLater && (process.platform === "win32" || process.platform === "darwin")) {
37923804
options = { persistent: true, recursive: !!recursive };
37933805
}
37943806
else {
@@ -3804,9 +3816,6 @@ var ts;
38043816
}
38053817
;
38063818
});
3807-
function isUNCPath(s) {
3808-
return s.length > 2 && s.charCodeAt(0) === 47 /* slash */ && s.charCodeAt(1) === 47 /* slash */;
3809-
}
38103819
},
38113820
resolvePath: function (path) {
38123821
return _path.resolve(path);

‎lib/typescriptServices.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,6 +2392,7 @@ declare namespace ts {
23922392
directoryName: string;
23932393
referenceCount: number;
23942394
}
2395+
function getNodeMajorVersion(): number;
23952396
let sys: System;
23962397
}
23972398
declare namespace ts {

‎lib/typescriptServices.js

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3428,6 +3428,21 @@ var ts;
34283428
/// <reference path="core.ts"/>
34293429
var ts;
34303430
(function (ts) {
3431+
function getNodeMajorVersion() {
3432+
if (typeof process === "undefined") {
3433+
return undefined;
3434+
}
3435+
var version = process.version;
3436+
if (!version) {
3437+
return undefined;
3438+
}
3439+
var dot = version.indexOf(".");
3440+
if (dot === -1) {
3441+
return undefined;
3442+
}
3443+
return parseInt(version.substring(1, dot));
3444+
}
3445+
ts.getNodeMajorVersion = getNodeMajorVersion;
34313446
ts.sys = (function () {
34323447
function getWScriptSystem() {
34333448
var fso = new ActiveXObject("Scripting.FileSystemObject");
@@ -3628,9 +3643,8 @@ var ts;
36283643
}
36293644
}
36303645
var watchedFileSet = createWatchedFileSet();
3631-
function isNode4OrLater() {
3632-
return parseInt(process.version.charAt(1)) >= 4;
3633-
}
3646+
var nodeVersion = getNodeMajorVersion();
3647+
var isNode4OrLater = nodeVersion >= 4;
36343648
function isFileSystemCaseSensitive() {
36353649
// win32\win64 are case insensitive platforms
36363650
if (platform === "win32" || platform === "win64") {
@@ -3782,13 +3796,11 @@ var ts;
37823796
// Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
37833797
// (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
37843798
var options;
3785-
if (!directoryExists(directoryName) || (isUNCPath(directoryName) && process.platform === "win32")) {
3786-
// do nothing if either
3787-
// - target folder does not exist
3788-
// - this is UNC path on Windows (https://github.com/Microsoft/TypeScript/issues/13874)
3799+
if (!directoryExists(directoryName)) {
3800+
// do nothing if target folder does not exist
37893801
return noOpFileWatcher;
37903802
}
3791-
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
3803+
if (isNode4OrLater && (process.platform === "win32" || process.platform === "darwin")) {
37923804
options = { persistent: true, recursive: !!recursive };
37933805
}
37943806
else {
@@ -3804,9 +3816,6 @@ var ts;
38043816
}
38053817
;
38063818
});
3807-
function isUNCPath(s) {
3808-
return s.length > 2 && s.charCodeAt(0) === 47 /* slash */ && s.charCodeAt(1) === 47 /* slash */;
3809-
}
38103819
},
38113820
resolvePath: function (path) {
38123821
return _path.resolve(path);

0 commit comments

Comments
 (0)