Skip to content

Commit f0702eb

Browse files
committed
Add node on the env path.
1 parent e56392e commit f0702eb

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/wizards/NewTypeScriptProjectWizard.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*/
1313
package ts.eclipse.ide.internal.ui.wizards;
1414

15+
import java.io.File;
1516
import java.lang.reflect.InvocationTargetException;
1617
import java.nio.charset.StandardCharsets;
1718
import java.util.ArrayList;
@@ -52,13 +53,16 @@
5253
import ts.eclipse.ide.core.utils.TypeScriptResourceUtil;
5354
import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
5455
import ts.eclipse.ide.terminal.interpreter.CommandTerminalService;
56+
import ts.eclipse.ide.terminal.interpreter.EnvPath;
5557
import ts.eclipse.ide.terminal.interpreter.LineCommand;
5658
import ts.eclipse.ide.ui.TypeScriptUIImageResource;
5759
import ts.eclipse.ide.ui.wizards.AbstractNewProjectWizard;
5860
import ts.npm.NpmConstants;
5961
import ts.npm.PackageJson;
6062
import ts.resources.jsonconfig.TsconfigJson;
63+
import ts.utils.FileUtils;
6164
import ts.utils.IOUtils;
65+
import ts.utils.StringUtils;
6266

6367
/**
6468
* Standard workbench wizard that creates a new TypeScript project resource in
@@ -193,6 +197,12 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
193197
properties.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
194198
"org.eclipse.tm.terminal.connector.local.LocalConnector");
195199

200+
// Prepare environnement Path:
201+
// - add nodejs directory
202+
String nodeFilePath = getNodeFilePath();
203+
if (!StringUtils.isEmpty(nodeFilePath)) {
204+
EnvPath.insertToEnvPath(properties, nodeFilePath);
205+
}
196206
CommandTerminalService.getInstance().executeCommand(commands, terminalId, properties, null);
197207

198208
}
@@ -224,6 +234,11 @@ public void run() {
224234
});
225235

226236
}
237+
238+
private String getNodeFilePath() {
239+
File nodeFile = TypeScriptResourceUtil.getWorkspaceNodejsInstallPath();
240+
return nodeFile != null ? FileUtils.getPath(nodeFile) : null;
241+
}
227242
};
228243
}
229244

0 commit comments

Comments
 (0)