microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-17 00:34:47 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

lint more files

Browse Source
This commit is contained in:
Vladimir Matveev
2016-08-17 14:47:54 -07:00
parent a2e5c2d2b5
commit a3a07a0f9f
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/cancellationToken.ts
View File

@@ -17,7 +17,7 @@ function createCancellationToken(args: string[]): HostCancellationToken {
}
}
if (!cancellationPipeName) {
return { isCancellationRequested: () => false };
return { isCancellationRequested: () => false };
}
return {
isCancellationRequested() {
@@ -25,10 +25,10 @@ function createCancellationToken(args: string[]): HostCancellationToken {
fs.statSync(cancellationPipeName);
return true;
}
catch(e) {
catch (e) {
return false;
}
}
};
}
export = createCancellationToken
export = createCancellationToken;

25
src/server/typingsInstaller/nodeTypingsInstaller.ts
View File

@@ -21,7 +21,7 @@ namespace ts.server.typingsInstaller {
basePath = os.homedir();
break;
case "darwin":
basePath = combinePaths(os.homedir(), "Library/Application Support/")
basePath = combinePaths(os.homedir(), "Library/Application Support/");
break;
}
@@ -32,7 +32,7 @@ namespace ts.server.typingsInstaller {
class FileLog implements Log {
constructor(private readonly logFile?: string) {
}
isEnabled() {
return this.logFile !== undefined;
}
@@ -44,9 +44,8 @@ namespace ts.server.typingsInstaller {
export class NodeTypingsInstaller extends TypingsInstaller {
private execSync: { (command: string, options: { stdio: "ignore" | "pipe" }): Buffer | string };
private exec: { (command: string, options: { cwd: string }, callback?: (error: Error, stdout: string, stderr: string) => void): any };
private npmBinPath: string;
private tsdRunCount = 1;
readonly installTypingHost: InstallTypingHost = sys;
@@ -55,7 +54,7 @@ namespace ts.server.typingsInstaller {
if (this.log.isEnabled()) {
this.log.writeLine(`Process id: ${process.pid}`);
}
const { exec, execSync } = require("child_process");
const { exec, execSync } = require("child_process");
this.execSync = execSync;
this.exec = exec;
}
@@ -68,7 +67,7 @@ namespace ts.server.typingsInstaller {
this.log.writeLine(`Global npm bin path '${this.npmBinPath}'`);
}
}
catch(e) {
catch (e) {
this.npmBinPath = "";
if (this.log.isEnabled()) {
this.log.writeLine(`Error when getting npm bin path: ${e}. Set bin path to ""`);
@@ -82,7 +81,7 @@ namespace ts.server.typingsInstaller {
case "closeProject":
this.closeProject(req);
}
})
});
}
protected isPackageInstalled(packageName: string) {
@@ -121,11 +120,11 @@ namespace ts.server.typingsInstaller {
protected sendResponse(response: SetTypings | InvalidateCachedTypings) {
if (this.log.isEnabled()) {
this.log.writeLine(`Sending response: ${JSON.stringify(response)}`)
this.log.writeLine(`Sending response: ${JSON.stringify(response)}`);
}
process.send(response);
if (this.log.isEnabled()) {
this.log.writeLine(`Response has been sent.`)
this.log.writeLine(`Response has been sent.`);
}
}
@@ -134,12 +133,12 @@ namespace ts.server.typingsInstaller {
this.tsdRunCount++;
const tsdPath = combinePaths(this.npmBinPath, "tsd");
if (this.log.isEnabled()) {
this.log.writeLine(`Running tsd ${id}, tsd path '${tsdPath}, typings to install: ${JSON.stringify(typingsToInstall)}. cache path '${cachePath}'`)
this.log.writeLine(`Running tsd ${id}, tsd path '${tsdPath}, typings to install: ${JSON.stringify(typingsToInstall)}. cache path '${cachePath}'`);
}
this.exec(`${tsdPath} install ${typingsToInstall.join(" ")} -ros`, { cwd: cachePath }, (err, stdout, stderr) => {
this.exec(`${tsdPath} install ${typingsToInstall.join(" ")} -ros`, { cwd: cachePath }, (err, stdout, stderr) => {
if (this.log.isEnabled()) {
this.log.writeLine(`TSD ${id} stdout: ${stdout}`);
this.log.writeLine(`TSD ${id} stderr: ${stderr}`)
this.log.writeLine(`TSD ${id} stderr: ${stderr}`);
}
const i = stdout.indexOf("running install");
if (i < 0) {
@@ -154,7 +153,7 @@ namespace ts.server.typingsInstaller {
installedTypings.push(match[1]);
}
postInstallAction(installedTypings);
})
});
}
}

14
src/server/typingsInstaller/typingsInstaller.ts
View File

@@ -17,11 +17,11 @@ namespace ts.server.typingsInstaller {
isEnabled(): boolean;
writeLine(text: string): void;
}
const nullLog: Log = {
isEnabled: () => false,
writeLine: () => {}
}
};
function tsdTypingToFileName(cachePath: string, tsdTypingFile: string) {
return combinePaths(cachePath, `typings/${tsdTypingFile}`);
@@ -33,7 +33,6 @@ namespace ts.server.typingsInstaller {
}
export abstract class TypingsInstaller {
private isTsdInstalled: boolean;
private packageNameToTypingLocation: Map<string> = createMap<string>();
@@ -81,14 +80,13 @@ namespace ts.server.typingsInstaller {
if (this.log.isEnabled()) {
this.log.writeLine(`No watchers are registered for project '${projectName}'`);
}
return;
}
for (const w of watchers) {
w.close();
}
delete this.projectWatchers[projectName]
delete this.projectWatchers[projectName];
if (this.log.isEnabled()) {
this.log.writeLine(`Closing file watchers for project '${projectName}' - done.`);
@@ -102,7 +100,7 @@ namespace ts.server.typingsInstaller {
}
return;
}
if (this.log.isEnabled()) {
this.log.writeLine(`Got install request ${JSON.stringify(req)}`);
}
@@ -123,7 +121,7 @@ namespace ts.server.typingsInstaller {
this.packageNameToTypingLocation,
req.typingOptions,
req.compilerOptions);
if (this.log.isEnabled()) {
this.log.writeLine(`Finished typings discovery: ${JSON.stringify(discoverTypingsResult)}`);
}
@@ -151,7 +149,7 @@ namespace ts.server.typingsInstaller {
}
if (this.knownCachesSet[cacheLocation]) {
if (this.log.isEnabled()) {
this.log.writeLine(`Cache location was already processed...`)
this.log.writeLine(`Cache location was already processed...`);
}
return;
}