Skip to content

Debug TS looks for tsconfig file in parent directories #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vrubezhny merged 1 commit into from
Nov 15, 2022
Merged

Debug TS looks for tsconfig file in parent directories #961

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions ...wildwebdeveloper/src/org/eclipse/wildwebdeveloper/debug/node/NodeRunDAPDebugDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,14 @@ private boolean configureAdditionalParameters(Map<String, Object> param) {
return false;
}

File programFile = new File(program);
if (Platform.getContentTypeManager().getContentType("org.eclipse.wildwebdeveloper.ts")
.isAssociatedWith(new File(program).getName())) {
.isAssociatedWith(programFile.getName())) {
// TypeScript Source Mappings Configuration
String tsConfigPath = cwd + "/tsconfig.json";
File parentDirectory = cwd == null ? programFile.getParentFile() : new File(cwd);
File tsConfigFile = findTSConfigFile(parentDirectory);
String errorMessage = null;
File tsConfigFile = new File(tsConfigPath);
Map<String, Object> tsConfig = readTsConfig(tsConfigFile);
Map<String, Object> tsConfig = readJSonFile(tsConfigFile);
Map<String, Object> co = tsConfig == null ? null : (Map<String, Object>)tsConfig.get("compilerOptions");
if (co == null) {
errorMessage = Messages.NodeDebug_TSConfirError_NoTsConfig;
Expand Down Expand Up @@ -222,7 +223,7 @@ private boolean configureAdditionalParameters(Map<String, Object> param) {
Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
IFile file = createNewEmptyFile(tsConfigPath);
IFile file = createNewEmptyFile(new File(parentDirectory, "tsconfig.json"));
if (file != null) {
try {
IDE.openEditor(
Expand All @@ -236,10 +237,10 @@ public void run() {
}
}

private IFile createNewEmptyFile(String tsConfigPath) {
private IFile createNewEmptyFile(File fsFile) {
IWorkspace ws = ResourcesPlugin.getWorkspace();
IWorkspaceRoot wr = ws.getRoot();
IFile file = wr.getFileForLocation(new Path(tsConfigPath));
IFile file = wr.getFileForLocation(new Path(fsFile.getAbsolutePath()));
if (!(file.exists() && file.isAccessible())) {
IFile[] result = new IFile[1];
try {
Expand Down Expand Up @@ -279,7 +280,7 @@ void createContainers(IResource resource) throws CoreException {

return true;
} else if (Platform.getContentTypeManager().getContentType("org.eclipse.wildwebdeveloper.js")
.isAssociatedWith(new File(program).getName())) {
.isAssociatedWith(programFile.getName())) {

// JavaScript configuration

Expand All @@ -291,8 +292,23 @@ void createContainers(IResource resource) throws CoreException {
}
return false;
}

private File findTSConfigFile(File parentDirectory) {
File tsConfigFile;
do {
tsConfigFile = new File(parentDirectory, "tsconfig.json");
if (tsConfigFile.isFile()) {
return tsConfigFile;
}
parentDirectory = parentDirectory.getParentFile();
} while (parentDirectory != null && parentDirectory.isDirectory());
return null;
}

public Map<String, Object> readTsConfig(File tsConfgFile) {
public Map<String, Object> readJSonFile(File tsConfgFile) {
if (tsConfgFile == null || !tsConfgFile.isFile()) {
return Map.of();
}
try (BufferedReader in = new BufferedReader(new FileReader(tsConfgFile))) {
String inputLine;
StringBuffer response = new StringBuffer();
Expand All @@ -302,7 +318,7 @@ public Map<String, Object> readTsConfig(File tsConfgFile) {
Type type = new TypeToken<Map<String, Object>>() {}.getType();
return new Gson().fromJson(response.toString(), type);
} catch (IOException e) {
return null;
return Map.of();
}
}
}