Display node.js fields. See

angelozerr#147

Author: angelozerr

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

@@ -197,7 +197,9 @@ public class TypeScriptUIMessages extends NLS {
 	public static String TypeScriptRuntimeAndNodejsWizardPage_typescript_group_label;
 	public static String TypeScriptRuntimeAndNodejsWizardPage_useEmbeddedTsRuntime_label;
 	public static String TypeScriptRuntimeAndNodejsWizardPage_useInstallTsRuntime_label;
-
+	public static String TypeScriptRuntimeAndNodejsWizardPage_useEmbeddedNodeJs_label;
+	public static String TypeScriptRuntimeAndNodejsWizardPage_useInstalledNodeJs_label;
+	
 	// NPM Module Versions
 	public static String NPMModuleVersionsSelectionDialog_title;
 	public static String NPMModuleVersionsSelectionDialog_message;

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

@@ -170,8 +170,10 @@ TypeScriptRuntimeAndNodejsWizardPage_title=TypeScript Runtime / Node.js
 TypeScriptRuntimeAndNodejsWizardPage_description=Select the TypeScript runtime and the Node.js required by the TypeScript tsserver.  
 TypeScriptRuntimeAndNodejsWizardPage_nodejs_group_label=Node.js
 TypeScriptRuntimeAndNodejsWizardPage_typescript_group_label=TypeScript Runtime
-TypeScriptRuntimeAndNodejsWizardPage_useEmbeddedTsRuntime_label=Use embedded TypeScript
-TypeScriptRuntimeAndNodejsWizardPage_useInstallTsRuntime_label=Install TypeScript
+TypeScriptRuntimeAndNodejsWizardPage_useEmbeddedTsRuntime_label=Use embedded
+TypeScriptRuntimeAndNodejsWizardPage_useInstallTsRuntime_label=Install
+TypeScriptRuntimeAndNodejsWizardPage_useEmbeddedNodeJs_label=Use embedded
+TypeScriptRuntimeAndNodejsWizardPage_useInstalledNodeJs_label=Use installed
 
 # NPM Module widget
 NPMModuleVersionsSelectionDialog_title=Open NPM module version for ''{0}''
@@ -180,5 +182,5 @@ NPMModuleVersionsSelectionDialog_searchJob_taskName=Searching
 
 # NPN Install Widgets
 NPMInstallWidget_ValidateVersionJob_name=Validate NPM module version job.
-NPMInstallWidget_SearchingVersions_status=Searching versions for ''{0}'' with 'npm show'
-NPMInstallWidget_InvalidVersion_status=Invalid version ''{0}'' for ''{1}''.
+NPMInstallWidget_SearchingVersions_status=Searching available versions for ''{0}'' module with 'npm show'...
+NPMInstallWidget_InvalidVersion_status=Invalid version ''{0}'' for ''{1}'' module.

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/dialogs/NPMModuleVersionsSelectionDialog.java

@@ -21,9 +21,7 @@
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
@@ -52,7 +50,7 @@ public NPMModuleVersionsSelectionDialog(String moduleName, Shell shell, boolean
 		setTitle(NLS.bind(TypeScriptUIMessages.NPMModuleVersionsSelectionDialog_title, moduleName));
 		setMessage(TypeScriptUIMessages.NPMModuleVersionsSelectionDialog_message);
 		setImage(TypeScriptUIImageResource.getImage(TypeScriptUIImageResource.IMG_NPM));
-		setListLabelProvider(new VersionLabelProvider());
+		setListLabelProvider(VersionLabelProvider.getInstance());
 		this.moduleName = moduleName;
 	}
 
@@ -131,14 +129,6 @@ protected Control createExtendedContentArea(Composite parent) {
 		return null;
 	}
 
-	protected class VersionLabelProvider extends LabelProvider {
-
-		@Override
-		public Image getImage(Object element) {
-			return TypeScriptUIImageResource.getImage(TypeScriptUIImageResource.IMG_NPM);
-		}
-	}
-
 	protected class VersionFilter extends ItemsFilter {
 
 		@Override

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/dialogs/VersionLabelProvider.java

@@ -0,0 +1,30 @@
+package ts.eclipse.ide.internal.ui.dialogs;
+
+import org.eclipse.jface.fieldassist.IContentProposal;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+
+import ts.eclipse.ide.ui.TypeScriptUIImageResource;
+
+public class VersionLabelProvider extends LabelProvider {
+
+	private static final VersionLabelProvider INSTANCE = new VersionLabelProvider();
+
+	public static VersionLabelProvider getInstance() {
+		return INSTANCE;
+	}
+
+	@Override
+	public String getText(Object element) {
+		if (element instanceof IContentProposal) {
+			return ((IContentProposal) element).getLabel();
+		}
+		return super.getText(element);
+	}
+
+	@Override
+	public Image getImage(Object element) {
+		return TypeScriptUIImageResource.getImage(TypeScriptUIImageResource.IMG_NPM);
+	}
+
+}

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

@@ -201,7 +201,7 @@ public void widgetSelected(SelectionEvent e) {
 				dialog.setFilterPath(filePathCombo.getText());
 				String result = dialog.open();
 				if (!StringUtils.isEmpty(result)) {
-					installedComboBox.setText(result);
+					filePathCombo.setText(result);
 				}
 
 			}

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

@@ -135,7 +135,7 @@ protected void createBody(Composite parent) {
 		label.setFont(font);
 
 		// Text for outDir
-		txtOutDir = new Text(subGroup, SWT.BORDER);
+		txtOutDir = new Text(subGroup, SWT.SINGLE | SWT.BORDER);
 		txtOutDir.addListener(SWT.Modify, this);
 		data = new GridData(SWT.FILL, SWT.CENTER, true, false);
 		txtOutDir.setLayoutData(data);