Skip to content

Commit b637d76

Browse files
mhegazymhegazy
committed
Merge pull request microsoft#8700 from Microsoft/Fix8692
Fix microsoft#8692: fix "tsserver as a library" (lssl) build target
2 parents d69f57b + c9b5145 commit b637d76

9 files changed

Lines changed: 168 additions & 148 deletions

File tree

‎Jakefile.js‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ var harnessSources = harnessCoreSources.concat([
160160
"protocol.d.ts",
161161
"session.ts",
162162
"client.ts",
163-
"editorServices.ts",
163+
"editorServices.ts"
164164
].map(function (f) {
165165
return path.join(serverDirectory, f);
166166
}));
@@ -174,7 +174,7 @@ var es2015LibrarySources = [
174174
"es2015.proxy.d.ts",
175175
"es2015.reflect.d.ts",
176176
"es2015.symbol.d.ts",
177-
"es2015.symbol.wellknown.d.ts",
177+
"es2015.symbol.wellknown.d.ts"
178178
];
179179

180180
var es2015LibrarySourceMap = es2015LibrarySources.map(function(source) {
@@ -183,34 +183,34 @@ var es2015LibrarySourceMap = es2015LibrarySources.map(function(source) {
183183

184184
var es2016LibrarySource = [ "es2016.array.include.d.ts" ];
185185

186-
var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
186+
var es2016LibrarySourceMap = es2016LibrarySource.map(function (source) {
187187
return { target: "lib." + source, sources: ["header.d.ts", source] };
188-
})
188+
});
189189

190190
var es2017LibrarySource = ["es2017.object.d.ts"];
191191

192-
var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
192+
var es2017LibrarySourceMap = es2017LibrarySource.map(function (source) {
193193
return { target: "lib." + source, sources: ["header.d.ts", source] };
194-
})
194+
});
195195

196-
var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]
196+
var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"];
197197

198198
var librarySourceMap = [
199199
// Host library
200-
{ target: "lib.dom.d.ts", sources: ["header.d.ts", "dom.generated.d.ts"], },
201-
{ target: "lib.dom.iterable.d.ts", sources: ["header.d.ts", "dom.iterable.d.ts"], },
202-
{ target: "lib.webworker.d.ts", sources: ["header.d.ts", "webworker.generated.d.ts"], },
203-
{ target: "lib.scripthost.d.ts", sources: ["header.d.ts", "scripthost.d.ts"], },
204-
200+
{ target: "lib.dom.d.ts", sources: ["header.d.ts", "dom.generated.d.ts"] },
201+
{ target: "lib.dom.iterable.d.ts", sources: ["header.d.ts", "dom.iterable.d.ts"] },
202+
{ target: "lib.webworker.d.ts", sources: ["header.d.ts", "webworker.generated.d.ts"] },
203+
{ target: "lib.scripthost.d.ts", sources: ["header.d.ts", "scripthost.d.ts"] },
204+
205205
// JavaScript library
206206
{ target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
207207
{ target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
208208
{ target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
209209
{ target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },
210210

211211
// JavaScript + all host library
212-
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources), },
213-
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts"), },
212+
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources) },
213+
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts") }
214214
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap);
215215

216216
var libraryTargets = librarySourceMap.map(function (f) {
@@ -251,7 +251,7 @@ function concatenateFiles(destinationFile, sourceFiles) {
251251
}
252252

253253
var useDebugMode = true;
254-
var host = (process.env.TYPESCRIPT_HOST || process.env.host || "node");
254+
var host = process.env.TYPESCRIPT_HOST || process.env.host || "node";
255255
var compilerFilename = "tsc.js";
256256
var LKGCompiler = path.join(LKGDirectory, compilerFilename);
257257
var builtLocalCompiler = path.join(builtLocalDirectory, compilerFilename);
@@ -300,7 +300,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
300300
options += " --out " + outFile;
301301
}
302302
else {
303-
options += " --module commonjs"
303+
options += " --module commonjs";
304304
}
305305

306306
if(opts.noResolve) {
@@ -315,7 +315,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
315315
}
316316

317317
if (opts.stripInternal) {
318-
options += " --stripInternal"
318+
options += " --stripInternal";
319319
}
320320

321321
var cmd = host + " " + compilerPath + " " + options + " ";
@@ -453,9 +453,9 @@ file(scriptsTsdJson);
453453

454454
task("tsd-scripts", [scriptsTsdJson], function () {
455455
var cmd = "tsd --config " + scriptsTsdJson + " install";
456-
console.log(cmd)
456+
console.log(cmd);
457457
exec(cmd);
458-
}, { async: true })
458+
}, { async: true });
459459

460460
var importDefinitelyTypedTestsDirectory = path.join(scriptsDirectory, "importDefinitelyTypedTests");
461461
var importDefinitelyTypedTestsJs = path.join(importDefinitelyTypedTestsDirectory, "importDefinitelyTypedTests.js");
@@ -525,9 +525,9 @@ compileFile(servicesFileInBrowserTest, servicesSources,[builtLocalDirectory, cop
525525
var serverFile = path.join(builtLocalDirectory, "tsserver.js");
526526
compileFile(serverFile, serverSources,[builtLocalDirectory, copyright].concat(serverSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true);
527527

528-
var lsslFile = path.join(builtLocalDirectory, "tslssl.js");
528+
var tsserverLibraryFile = path.join(builtLocalDirectory, "tsserverlibrary.js");
529529
compileFile(
530-
lsslFile,
530+
tsserverLibraryFile,
531531
languageServiceLibrarySources,
532532
[builtLocalDirectory, copyright].concat(languageServiceLibrarySources),
533533
/*prefixes*/ [copyright],
@@ -536,7 +536,7 @@ compileFile(
536536

537537
// Local target to build the language service server library
538538
desc("Builds language service server library");
539-
task("lssl", [lsslFile]);
539+
task("lssl", [tsserverLibraryFile]);
540540

541541
// Local target to build the compiler and services
542542
desc("Builds the full compiler and services");
@@ -595,8 +595,8 @@ task("generate-spec", [specMd]);
595595

596596
// Makes a new LKG. This target does not build anything, but errors if not all the outputs are present in the built/local directory
597597
desc("Makes a new LKG out of the built js files");
598-
task("LKG", ["clean", "release", "local"].concat(libraryTargets), function() {
599-
var expectedFiles = [tscFile, servicesFile, serverFile, nodePackageFile, nodeDefinitionsFile, standaloneDefinitionsFile].concat(libraryTargets);
598+
task("LKG", ["clean", "release", "local", "lssl"].concat(libraryTargets), function() {
599+
var expectedFiles = [tscFile, servicesFile, serverFile, nodePackageFile, nodeDefinitionsFile, standaloneDefinitionsFile, tsserverLibraryFile].concat(libraryTargets);
600600
var missingFiles = expectedFiles.filter(function (f) {
601601
return !fs.existsSync(f);
602602
});
@@ -622,7 +622,7 @@ directory(builtLocalDirectory);
622622
var run = path.join(builtLocalDirectory, "run.js");
623623
compileFile(run, harnessSources, [builtLocalDirectory, tscFile].concat(libraryTargets).concat(harnessSources), [], /*useBuiltCompiler:*/ true);
624624

625-
var internalTests = "internal/"
625+
var internalTests = "internal/";
626626

627627
var localBaseline = "tests/baselines/local/";
628628
var refBaseline = "tests/baselines/reference/";
@@ -709,7 +709,7 @@ function runConsoleTests(defaultReporter, defaultSubsets) {
709709
testTimeout = 100000;
710710
}
711711

712-
colors = process.env.colors || process.env.color
712+
colors = process.env.colors || process.env.color;
713713
colors = colors ? ' --no-colors ' : ' --colors ';
714714
reporter = process.env.reporter || process.env.r || defaultReporter;
715715
var lintFlag = process.env.lint !== 'false';
@@ -718,7 +718,7 @@ function runConsoleTests(defaultReporter, defaultSubsets) {
718718
// default timeout is 2sec which really should be enough, but maybe we just need a small amount longer
719719
var subsetRegexes;
720720
if(defaultSubsets.length === 0) {
721-
subsetRegexes = [tests]
721+
subsetRegexes = [tests];
722722
}
723723
else {
724724
var subsets = tests ? tests.split("|") : defaultSubsets;
@@ -765,8 +765,8 @@ task("generate-code-coverage", ["tests", builtLocalDirectory], function () {
765765
}, { async: true });
766766

767767
// Browser tests
768-
var nodeServerOutFile = 'tests/webTestServer.js'
769-
var nodeServerInFile = 'tests/webTestServer.ts'
768+
var nodeServerOutFile = "tests/webTestServer.js";
769+
var nodeServerInFile = "tests/webTestServer.ts";
770770
compileFile(nodeServerOutFile, [nodeServerInFile], [builtLocalDirectory, tscFile], [], /*useBuiltCompiler:*/ true, { noOutFile: true });
771771

772772
desc("Runs browserify on run.js to produce a file suitable for running tests in the browser");
@@ -778,7 +778,7 @@ task("browserify", ["tests", builtLocalDirectory, nodeServerOutFile], function()
778778
desc("Runs the tests using the built run.js file like 'jake runtests'. Syntax is jake runtests-browser. Additional optional parameters tests=[regex], port=, browser=[chrome|IE]");
779779
task("runtests-browser", ["tests", "browserify", builtLocalDirectory, servicesFileInBrowserTest], function() {
780780
cleanTestDirs();
781-
host = "node"
781+
host = "node";
782782
port = process.env.port || process.env.p || '8888';
783783
browser = process.env.browser || process.env.b || "IE";
784784
tests = process.env.test || process.env.tests || process.env.t;
@@ -792,13 +792,13 @@ task("runtests-browser", ["tests", "browserify", builtLocalDirectory, servicesFi
792792
}
793793

794794
tests = tests ? tests : '';
795-
var cmd = host + " tests/webTestServer.js " + port + " " + browser + " " + tests
795+
var cmd = host + " tests/webTestServer.js " + port + " " + browser + " " + tests;
796796
console.log(cmd);
797797
exec(cmd);
798798
}, {async: true});
799799

800800
function getDiffTool() {
801-
var program = process.env['DIFF']
801+
var program = process.env['DIFF'];
802802
if (!program) {
803803
fail("Add the 'DIFF' environment variable to the path of the program you want to use.");
804804
}
@@ -827,11 +827,11 @@ task("tests-debug", ["setDebugMode", "tests"]);
827827
// Makes the test results the new baseline
828828
desc("Makes the most recent test results the new baseline, overwriting the old baseline");
829829
task("baseline-accept", function(hardOrSoft) {
830-
if (!hardOrSoft || hardOrSoft == "hard") {
830+
if (!hardOrSoft || hardOrSoft === "hard") {
831831
jake.rmRf(refBaseline);
832832
fs.renameSync(localBaseline, refBaseline);
833833
}
834-
else if (hardOrSoft == "soft") {
834+
else if (hardOrSoft === "soft") {
835835
var files = jake.readdirR(localBaseline);
836836
for (var i in files) {
837837
jake.cpR(files[i], refBaseline);
@@ -910,14 +910,14 @@ task("update-sublime", ["local", serverFile], function() {
910910
});
911911

912912
var tslintRuleDir = "scripts/tslint";
913-
var tslintRules = ([
913+
var tslintRules = [
914914
"nextLineRule",
915915
"preferConstRule",
916916
"booleanTriviaRule",
917917
"typeOperatorSpacingRule",
918918
"noInOperatorRule",
919919
"noIncrementDecrementRule"
920-
]);
920+
];
921921
var tslintRulesFiles = tslintRules.map(function(p) {
922922
return path.join(tslintRuleDir, p + ".ts");
923923
});
@@ -942,7 +942,7 @@ function getLinterOptions() {
942942

943943
function lintFileContents(options, path, contents) {
944944
var ll = new Linter(path, contents, options);
945-
console.log("Linting '" + path + "'.")
945+
console.log("Linting '" + path + "'.");
946946
return ll.lint();
947947
}
948948

‎src/harness/harnessLanguageService.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,14 @@ namespace Harness.LanguageService {
641641

642642
startGroup(): void {
643643
}
644+
645+
setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any {
646+
return setTimeout(callback, ms, args);
647+
}
648+
649+
clearTimeout(timeoutId: any): void {
650+
clearTimeout(timeoutId);
651+
}
644652
}
645653

646654
export class ServerLanguageServiceAdapter implements LanguageServiceAdapter {

‎src/server/editorServices.ts‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace ts.server {
3232
children: ScriptInfo[] = []; // files referenced by this file
3333
defaultProject: Project; // project to use by default for file
3434
fileWatcher: FileWatcher;
35-
formatCodeOptions = ts.clone(CompilerService.defaultFormatCodeOptions);
35+
formatCodeOptions = ts.clone(CompilerService.getDefaultFormatCodeOptions(this.host));
3636
path: Path;
3737
scriptKind: ScriptKind;
3838

@@ -533,7 +533,7 @@ namespace ts.server {
533533
// number becomes 0 for a watcher, then we should close it.
534534
directoryWatchersRefCount: ts.Map<number> = {};
535535
hostConfiguration: HostConfiguration;
536-
timerForDetectingProjectFileListChanges: Map<NodeJS.Timer> = {};
536+
timerForDetectingProjectFileListChanges: Map<any> = {};
537537

538538
constructor(public host: ServerHost, public psLogger: Logger, public eventHandler?: ProjectServiceEventHandler) {
539539
// ts.disableIncrementalParsing = true;
@@ -542,7 +542,7 @@ namespace ts.server {
542542

543543
addDefaultHostConfiguration() {
544544
this.hostConfiguration = {
545-
formatCodeOptions: ts.clone(CompilerService.defaultFormatCodeOptions),
545+
formatCodeOptions: ts.clone(CompilerService.getDefaultFormatCodeOptions(this.host)),
546546
hostInfo: "Unknown host"
547547
};
548548
}
@@ -593,9 +593,9 @@ namespace ts.server {
593593

594594
startTimerForDetectingProjectFileListChanges(project: Project) {
595595
if (this.timerForDetectingProjectFileListChanges[project.projectFilename]) {
596-
clearTimeout(this.timerForDetectingProjectFileListChanges[project.projectFilename]);
596+
this.host.clearTimeout(this.timerForDetectingProjectFileListChanges[project.projectFilename]);
597597
}
598-
this.timerForDetectingProjectFileListChanges[project.projectFilename] = setTimeout(
598+
this.timerForDetectingProjectFileListChanges[project.projectFilename] = this.host.setTimeout(
599599
() => this.handleProjectFileListChanges(project),
600600
250
601601
);
@@ -1382,23 +1382,25 @@ namespace ts.server {
13821382
return ts.isExternalModule(sourceFile);
13831383
}
13841384

1385-
static defaultFormatCodeOptions: ts.FormatCodeOptions = {
1386-
IndentSize: 4,
1387-
TabSize: 4,
1388-
NewLineCharacter: ts.sys ? ts.sys.newLine : "\n",
1389-
ConvertTabsToSpaces: true,
1390-
IndentStyle: ts.IndentStyle.Smart,
1391-
InsertSpaceAfterCommaDelimiter: true,
1392-
InsertSpaceAfterSemicolonInForStatements: true,
1393-
InsertSpaceBeforeAndAfterBinaryOperators: true,
1394-
InsertSpaceAfterKeywordsInControlFlowStatements: true,
1395-
InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
1396-
InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
1397-
InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
1398-
InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
1399-
PlaceOpenBraceOnNewLineForFunctions: false,
1400-
PlaceOpenBraceOnNewLineForControlBlocks: false,
1401-
};
1385+
static getDefaultFormatCodeOptions(host: ServerHost): ts.FormatCodeOptions {
1386+
return ts.clone({
1387+
IndentSize: 4,
1388+
TabSize: 4,
1389+
NewLineCharacter: host.newLine || "\n",
1390+
ConvertTabsToSpaces: true,
1391+
IndentStyle: ts.IndentStyle.Smart,
1392+
InsertSpaceAfterCommaDelimiter: true,
1393+
InsertSpaceAfterSemicolonInForStatements: true,
1394+
InsertSpaceBeforeAndAfterBinaryOperators: true,
1395+
InsertSpaceAfterKeywordsInControlFlowStatements: true,
1396+
InsertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
1397+
InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
1398+
InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
1399+
InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
1400+
PlaceOpenBraceOnNewLineForFunctions: false,
1401+
PlaceOpenBraceOnNewLineForControlBlocks: false,
1402+
});
1403+
}
14021404
}
14031405

14041406
export interface LineCollection {

‎src/server/server.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,16 +266,21 @@ namespace ts.server {
266266
}
267267
}
268268

269+
const sys = <ServerHost>ts.sys;
270+
269271
// Override sys.write because fs.writeSync is not reliable on Node 4
270-
ts.sys.write = (s: string) => writeMessage(s);
271-
ts.sys.watchFile = (fileName, callback) => {
272+
sys.write = (s: string) => writeMessage(s);
273+
sys.watchFile = (fileName, callback) => {
272274
const watchedFile = pollingWatchedFileSet.addFile(fileName, callback);
273275
return {
274276
close: () => pollingWatchedFileSet.removeFile(watchedFile)
275277
};
276278
};
277279

278-
const ioSession = new IOSession(ts.sys, logger);
280+
sys.setTimeout = setTimeout;
281+
sys.clearTimeout = clearTimeout;
282+
283+
const ioSession = new IOSession(sys, logger);
279284
process.on("uncaughtException", function(err: Error) {
280285
ioSession.logError(err, "unknown");
281286
});

‎src/server/session.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ namespace ts.server {
133133
}
134134

135135
export interface ServerHost extends ts.System {
136+
setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
137+
clearTimeout(timeoutId: any): void;
136138
}
137139

138140
export class Session {

0 commit comments

Comments
 (0)