Skip to content

Commit 3db8141

Browse files
Removed forced opening of files when compiling with tsserver
This is no longer needed because the server does not loose track of files. Reverts commit babde9c.
1 parent d28b0e9 commit 3db8141

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

eclipse/ts.eclipse.ide.core/src/ts/eclipse/ide/internal/core/resources/IDETypeScriptProject.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -388,13 +388,12 @@ protected ITypeScriptLint createTslint(File tslintFile, File tslintJsonFile, Fil
388388
@Override
389389
public void compileWithTsserver(List<IFile> updatedTsFiles, List<IFile> removedTsFiles, IProgressMonitor monitor)
390390
throws TypeScriptException {
391-
List<IFile> tsFilesToClosed = new ArrayList<>();
392391
try {
393392
List<String> tsFilesToCompile = new ArrayList<>();
394393
// Collect ts files to compile by using tsserver to retrieve
395394
// dependencies files.
396395
// It works only if tsconfig.json declares "compileOnSave: true".
397-
if (collectTsFilesToCompile(updatedTsFiles, getClient(), tsFilesToCompile, tsFilesToClosed, false,
396+
if (collectTsFilesToCompile(updatedTsFiles, getClient(), tsFilesToCompile, false,
398397
monitor)) {
399398
return;
400399
}
@@ -411,10 +410,6 @@ public void compileWithTsserver(List<IFile> updatedTsFiles, List<IFile> removedT
411410
throw e;
412411
} catch (Exception e) {
413412
throw new TypeScriptException(e);
414-
} finally {
415-
for (IFile tsFile : tsFilesToClosed) {
416-
closeFile(tsFile);
417-
}
418413
}
419414
}
420415

@@ -429,22 +424,14 @@ public void compileWithTsserver(List<IFile> updatedTsFiles, List<IFile> removedT
429424
* @throws Exception
430425
*/
431426
private boolean collectTsFilesToCompile(List<IFile> tsFiles, ITypeScriptServiceClient client,
432-
List<String> tsFilesToCompile, List<IFile> tsFilesToClosed, boolean exclude, IProgressMonitor monitor)
427+
List<String> tsFilesToCompile, boolean exclude, IProgressMonitor monitor)
433428
throws Exception {
434429
for (IFile tsFile : tsFiles) {
435430
if (monitor.isCanceled()) {
436431
return true;
437432
}
438433
String filename = WorkbenchResourceUtil.getFileName(tsFile);
439434
if (!tsFilesToCompile.contains(filename)) {
440-
// tsserver needs that file must be opened, force the "open"
441-
// if file is not opened.
442-
// see
443-
// https://github.com/angelozerr/typescript.java/issues/142
444-
if (getOpenedFile(tsFile) == null) {
445-
openFile(tsFile, null);
446-
tsFilesToClosed.add(tsFile);
447-
}
448435
collectTsFilesToCompile(filename, client, tsFilesToCompile, exclude);
449436
}
450437
}

0 commit comments

Comments
 (0)