Add node Path in the node.js configuration preferences page.

Author: angelozerr

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/TypeScriptUIMessages.java

@@ -61,7 +61,7 @@ public class TypeScriptUIMessages extends NLS {
 	public static String NodejsConfigurationBlock_nodejs_group_label;
 	public static String NodejsConfigurationBlock_embedded_checkbox_label;
 	public static String NodejsConfigurationBlock_installed_checkbox_label;
-
+	public static String NodejsConfigurationBlock_nodePath_label;
 	// tsserver
 	public static String ServerConfigurationBlock_typescript_group_label;
 	public static String ServerConfigurationBlock_embedded_checkbox_label;
@@ -115,6 +115,7 @@ public class TypeScriptUIMessages extends NLS {
 	public static String TypeScriptBuilder_enable_Error_message;
 	public static String TypeScriptBuilder_disable_Error_message;
 
+
 	public static ResourceBundle getResourceBundle() {
 		try {
 			if (fResourceBundle == null)

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/TypeScriptUIMessages.properties

@@ -24,7 +24,7 @@ TypeScriptHyperlink_text=TypeScript - Go to definition
 TypeScriptConsoleJob_name=TypeScript Console Job
 ConsoleTerminateAction_tooltipText=Stop tsserver of [{0}] project.
 
-# Preferencesory 
+# Preferences
 TypeScriptMainPropertyPage_enable_builder_checkbox_label=Enable TypeScript B&uilder?
 TypeScriptMainPropertyPage_enable_builder_checkbox_description=Builder is required to <a href=\"compile\">compile/build on save</a> and <a href=\"tslint\">validate with tslint</a>.
 
@@ -40,7 +40,7 @@ PropertyAndPreferencePage_useprojectsettings_label=Enable pr&oject specific sett
 NodejsConfigurationBlock_nodejs_group_label=Consume TypeScript tsserver, tsc with
 NodejsConfigurationBlock_embedded_checkbox_label=Embedded node.js
 NodejsConfigurationBlock_installed_checkbox_label=Installed node.js
-
+NodejsConfigurationBlock_nodePath_label=Path:
 ServerConfigurationBlock_typescript_group_label=Consume TypeScript tsserver with
 ServerConfigurationBlock_embedded_checkbox_label=Embedded TypeScript
 ServerConfigurationBlock_installed_checkbox_label=Installed TypeScript

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/preferences/NodejsConfigurationBlock.java

@@ -25,6 +25,8 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
 
 import ts.eclipse.ide.core.TypeScriptCorePlugin;
@@ -37,6 +39,7 @@
 import ts.eclipse.ide.internal.ui.dialogs.WorkspaceResourceSelectionDialog.Mode;
 import ts.eclipse.ide.ui.preferences.OptionsConfigurationBlock;
 import ts.eclipse.ide.ui.preferences.ScrolledPageContent;
+import ts.utils.FileUtils;
 import ts.utils.StringUtils;
 
 /**
@@ -59,6 +62,8 @@ public class NodejsConfigurationBlock extends OptionsConfigurationBlock {
 
 	private Button browseFileSystemButton;
 	private Button browseWorkspaceButton;
+	private Label nodePathTitle;
+	private Text nodePath;
 
 	public NodejsConfigurationBlock(IStatusChangeListener context, IProject project,
 			IWorkbenchPreferenceContainer container) {
@@ -102,7 +107,7 @@ private Composite createUI(Composite parent) {
 
 		controlsComposite = new Composite(composite, SWT.NONE);
 		controlsComposite.setFont(composite.getFont());
-		controlsComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
+		controlsComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
 		layout = new GridLayout();
 		layout.marginHeight = 0;
@@ -117,13 +122,15 @@ private Composite createUI(Composite parent) {
 		Group group = new Group(controlsComposite, SWT.NONE);
 		group.setFont(controlsComposite.getFont());
 		group.setText(TypeScriptUIMessages.NodejsConfigurationBlock_nodejs_group_label);
-		group.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
+		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		group.setLayout(layout);
 
 		// Embedded node.js
 		createEmbeddedNodejsField(group);
 		// Installed node.js
 		createInstalledNodejsField(group);
+		// Path info.
+		createNodePathInfo(composite);
 		updateComboBoxes();
 		return pageContent;
 	}
@@ -168,7 +175,12 @@ public void widgetSelected(SelectionEvent e) {
 		String[] defaultPaths = IDENodejsProcessHelper.getDefaultNodejsPaths();
 		installedComboBox = newComboControl(parent, PREF_NODEJS_PATH, defaultPaths, defaultPaths, false);
 		installedComboBox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
+		installedComboBox.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				updatePath();
+			}
+		});
 		// Create Browse buttons.
 		createBrowseButtons(parent, installedComboBox);
 
@@ -219,12 +231,44 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
+	private void createNodePathInfo(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		composite.setLayout(new GridLayout());
+		GridData gridData = new GridData(GridData.FILL_BOTH);
+		composite.setLayoutData(gridData);
+
+		// Node path label
+		nodePathTitle = new Label(composite, SWT.NONE);
+		nodePathTitle.setText(TypeScriptUIMessages.NodejsConfigurationBlock_nodePath_label);
+		gridData = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
+		nodePathTitle.setLayoutData(gridData);
+
+		nodePath = new Text(composite, SWT.WRAP | SWT.READ_ONLY);
+		nodePath.setText(""); //$NON-NLS-1$
+		gridData = new GridData(GridData.FILL_BOTH);
+		gridData.horizontalSpan = 2;
+		gridData.widthHint = 200;
+		nodePath.setLayoutData(gridData);
+	}
+
 	private void updateComboBoxes() {
 		boolean embedded = useEmbedNodeJs.getSelection();
 		embeddedComboBox.setEnabled(embedded);
 		installedComboBox.setEnabled(!embedded);
 		browseFileSystemButton.setEnabled(!embedded);
 		browseWorkspaceButton.setEnabled(!embedded);
+		updatePath();
+	}
+
+	private void updatePath() {
+		boolean embedded = useEmbedNodeJs.getSelection();
+		if (embedded) {
+			IEmbeddedNodejs[] installs = TypeScriptCorePlugin.getNodejsInstallManager().getNodejsInstalls();
+			IEmbeddedNodejs install = installs[embeddedComboBox.getSelectionIndex()];
+			nodePath.setText(FileUtils.getPath(install.getPath()));
+		} else {
+			nodePath.setText(installedComboBox.getText());
+		}
 	}
 
 	@Override