Execute npm install typescript. See

angelozerr · angelozerr · commit 8f56ae5bc195 · 2017-03-18T00:56:50.000+01:00
angelozerr#147
diff --git a/eclipse/ts.eclipse.ide.ui/META-INF/MANIFEST.MF b/eclipse/ts.eclipse.ide.ui/META-INF/MANIFEST.MF
@@ -29,7 +29,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.tm4e.markdown,
  org.eclipse.tm4e.core,
  org.eclipse.tm4e.ui,
- com.google.gson
+ com.google.gson,
+ ts.eclipse.ide.terminal.interpreter,
+ org.eclipse.tm.terminal.view.core,
+ org.eclipse.tm.terminal.view.ui
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: ts.eclipse.ide.ui.TypeScriptUIPlugin
 Import-Package: com.eclipsesource.json;version="[0.9.4,0.9.5)"
diff --git a/eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/wizards/NewTypeScriptProjectWizard.java b/eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/wizards/NewTypeScriptProjectWizard.java
@@ -13,18 +13,24 @@
 package ts.eclipse.ide.internal.ui.wizards;
 
 import java.lang.reflect.InvocationTargetException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.tm.terminal.view.core.interfaces.constants.ITerminalsConnectorConstants;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
@@ -34,16 +40,21 @@
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
 import org.eclipse.ui.internal.ide.DialogUtil;
 import org.eclipse.ui.internal.wizards.newresource.ResourceMessages;
+import org.osgi.service.prefs.BackingStoreException;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
+import ts.eclipse.ide.core.TypeScriptCorePlugin;
+import ts.eclipse.ide.core.preferences.TypeScriptCorePreferenceConstants;
 import ts.eclipse.ide.core.utils.TypeScriptResourceUtil;
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
+import ts.eclipse.ide.terminal.interpreter.CommandTerminalService;
 import ts.eclipse.ide.ui.TypeScriptUIImageResource;
 import ts.eclipse.ide.ui.wizards.AbstractNewProjectWizard;
 import ts.resources.jsonconfig.TsconfigJson;
 import ts.utils.IOUtils;
+import ts.utils.StringUtils;
 
 /**
  * Standard workbench wizard that creates a new TypeScript project resource in
@@ -106,7 +117,7 @@ public void addPages() {
 
 	@Override
 	protected IRunnableWithProgress getRunnable(IProject newProjectHandle, IProjectDescription description,
-			IPath projectLocation) {
+			IPath projectLocationPath) {
 		TsconfigJson json = new TsconfigJson();
 		json.setCompileOnSave(true);
 		tsconfigPage.addContents(json);
@@ -148,6 +159,35 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
 					throw new InvocationTargetException(e);
 				}
 
+				// Install TypeScript if needed
+				String cmd = tsRuntimeAndNodeJsPage.getNpmInstallCommand();
+				if (!StringUtils.isEmpty(cmd)) {
+
+					// Prepare terminal properties
+					String terminalId = "TypeScript Projects";
+					Map<String, Object> properties = new HashMap<String, Object>();
+					properties.put(ITerminalsConnectorConstants.PROP_TITLE, terminalId);
+					properties.put(ITerminalsConnectorConstants.PROP_ENCODING, StandardCharsets.UTF_8.name());
+					properties.put(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR,
+							projectLocationPath.toString());
+					properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID,
+							"ts.eclipse.ide.terminal.interpreter.LocalInterpreterLauncherDelegate");
+					properties.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
+							"org.eclipse.tm.terminal.connector.local.LocalConnector");
+
+					CommandTerminalService.getInstance().executeCommand(cmd, terminalId, properties, null);
+					
+					IEclipsePreferences node = new ProjectScope(newProjectHandle).getNode(TypeScriptCorePlugin.PLUGIN_ID);
+					node.putBoolean(TypeScriptCorePreferenceConstants.USE_EMBEDDED_TYPESCRIPT, false);
+					node.put(TypeScriptCorePreferenceConstants.INSTALLED_TYPESCRIPT_PATH, "${project_loc:node_modules/typescript}");
+					try {
+						node.flush();
+					} catch (BackingStoreException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+
 				getShell().getDisplay().syncExec(new Runnable() {
 
 					@Override
diff --git a/eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/wizards/TypeScriptRuntimeAndNodejsWizardPage.java b/eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/wizards/TypeScriptRuntimeAndNodejsWizardPage.java
@@ -34,7 +34,8 @@ public class TypeScriptRuntimeAndNodejsWizardPage extends AbstractWizardPage {
 
 	private static final String PAGE_NAME = "TypeScriptRuntimeAndNodejsWizardPage";
 
-	private Button useEmbeddedTsRuntime;
+	private Button useEmbeddedTsRuntimeButton;
+	private boolean useEmbeddedTsRuntime;
 	private NPMInstallWidget installTsRuntime;
 
 	private Combo embeddedTsRuntime;
@@ -133,15 +134,15 @@ private void createTypeScriptRuntimeBody(Composite parent) {
 		// Install TypeScript
 		createInstallScriptField(group);
 
-		useEmbeddedTsRuntime.setSelection(true);
+		useEmbeddedTsRuntimeButton.setSelection(true);
 		updateTsRuntimeMode();
 	}
 
 	private void createEmbeddedTypeScriptField(Composite parent) {
-		useEmbeddedTsRuntime = new Button(parent, SWT.RADIO);
-		useEmbeddedTsRuntime
+		useEmbeddedTsRuntimeButton = new Button(parent, SWT.RADIO);
+		useEmbeddedTsRuntimeButton
 				.setText(TypeScriptUIMessages.TypeScriptRuntimeAndNodejsWizardPage_useEmbeddedTsRuntime_label);
-		useEmbeddedTsRuntime.addSelectionListener(new SelectionAdapter() {
+		useEmbeddedTsRuntimeButton.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateTsRuntimeMode();
@@ -176,9 +177,9 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	private void updateTsRuntimeMode() {
-		boolean embedded = useEmbeddedTsRuntime.getSelection();
-		embeddedTsRuntime.setEnabled(embedded);
-		installTsRuntime.setEnabled(!embedded);
+		useEmbeddedTsRuntime = useEmbeddedTsRuntimeButton.getSelection();
+		embeddedTsRuntime.setEnabled(useEmbeddedTsRuntime);
+		installTsRuntime.setEnabled(!useEmbeddedTsRuntime);
 	}
 
 	@Override
@@ -193,4 +194,11 @@ protected boolean validatePage() {
 		return false;
 	}
 
+	public String getNpmInstallCommand() {
+		if (useEmbeddedTsRuntime) {
+			return null;
+		}
+		return installTsRuntime.getNpmInstallCommand();
+	}
+
 }
diff --git a/eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/utils/NPMInstallWidget.java b/eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/utils/NPMInstallWidget.java
@@ -13,6 +13,8 @@
 
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -24,6 +26,7 @@
 
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
 import ts.eclipse.ide.internal.ui.dialogs.NPMModuleVersionsSelectionDialog;
+import ts.npm.NPMHelper;
 
 /**
  * NPM install widget provides :
@@ -41,6 +44,8 @@ public class NPMInstallWidget extends Composite {
 	private Text versionText;
 	private Button searchButton;
 
+	private String version;
+
 	public NPMInstallWidget(String moduleName, Composite parent, int style) {
 		super(parent, style);
 		this.moduleName = moduleName;
@@ -58,7 +63,13 @@ private void createUI(Composite parent) {
 
 		versionText = new Text(body, SWT.SINGLE | SWT.BORDER);
 		versionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		versionText.addModifyListener(new ModifyListener() {
 
+			@Override
+			public void modifyText(ModifyEvent event) {
+				NPMInstallWidget.this.version = versionText.getText();
+			}
+		});
 		searchButton = new Button(body, SWT.PUSH);
 		searchButton.setText(TypeScriptUIMessages.Browse);
 		searchButton.addSelectionListener(new SelectionAdapter() {
@@ -74,10 +85,23 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
+	public void setVersion(String version) {
+		versionText.setText(version);
+	}
+
 	@Override
 	public void setEnabled(boolean enabled) {
 		super.setEnabled(enabled);
 		versionText.setEnabled(enabled);
 		searchButton.setEnabled(enabled);
 	}
+
+	/**
+	 * Returns the npm install command.
+	 * 
+	 * @return the npm install command.
+	 */
+	public String getNpmInstallCommand() {
+		return NPMHelper.getNpmInstallCommand(moduleName, version);
+	}
 }
diff --git a/eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/wizards/AbstractNewProjectWizard.java b/eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/wizards/AbstractNewProjectWizard.java
@@ -22,6 +22,7 @@
 import java.util.StringTokenizer;
 
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.filesystem.URIUtil;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResourceStatus;
@@ -225,7 +226,8 @@ private IProject createNewProject() {
 		}
 
 		// create the new project operation
-		IRunnableWithProgress op = getRunnable(newProjectHandle, description, mainPage.getLocationPath());
+		IPath projectLocationPath = URIUtil.toPath(mainPage.getLocationURI());
+		IRunnableWithProgress op = getRunnable(newProjectHandle, description, projectLocationPath);
 
 		// run the new project creation operation
 		try {
