Refresh node_modules/$name folder

Author: angelozerr

eclipse/terminal/ts.eclipse.ide.terminal.interpreter.npm/src/ts/eclipse/ide/terminal/interpreter/npm/internal/NpmTerminalInterpreterPlugin.java

@@ -5,6 +5,8 @@
 
 public class NpmTerminalInterpreterPlugin implements BundleActivator {
 
+	public static final String PLUGIN_ID = "ts.eclipse.ide.terminal.interpreter.npm";
+
 	@Override
 	public void start(BundleContext context) throws Exception {
 

eclipse/terminal/ts.eclipse.ide.terminal.interpreter.npm/src/ts/eclipse/ide/terminal/interpreter/npm/internal/commands/NpmInstallCommandInterpreter.java

@@ -1,8 +1,13 @@
 package ts.eclipse.ide.terminal.interpreter.npm.internal.commands;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
@@ -11,13 +16,17 @@
 
 import ts.eclipse.ide.terminal.interpreter.AbstractCommandInterpreter;
 import ts.eclipse.ide.terminal.interpreter.UIInterpreterHelper;
+import ts.eclipse.ide.terminal.interpreter.npm.internal.NpmTerminalInterpreterPlugin;
 
 public class NpmInstallCommandInterpreter extends AbstractCommandInterpreter {
 
-	private final IPath NODE_MODULES_PATH = new Path("node_modules");
+	private final String NODE_MODULES = "node_modules";
+
+	private final List<String> folders;
 
 	public NpmInstallCommandInterpreter(String workingDir) {
 		super(workingDir);
+		this.folders = new ArrayList<String>();
 	}
 
 	@Override
@@ -29,12 +38,50 @@ public void execute() {
 
 				@Override
 				public IStatus runInUIThread(IProgressMonitor monitor) {
-					if (container.exists(NODE_MODULES_PATH)) {
-						UIInterpreterHelper.selectRevealInProjectExplorer(container.getFolder(NODE_MODULES_PATH));
+					try {
+						List<IResource> resources = getResources(monitor);
+						if (resources.size() > 0) {
+							UIInterpreterHelper.selectRevealInDefaultViews(resources.get(0));
+						}
+					} catch (CoreException e) {
+						return new Status(IStatus.ERROR, NpmTerminalInterpreterPlugin.PLUGIN_ID,
+								"Error while collecting npm folders", e);
 					}
 					return Status.OK_STATUS;
 				}
+
+				private List<IResource> getResources(IProgressMonitor monitor) throws CoreException {
+					List<IResource> resources = new ArrayList<IResource>();
+					if (folders.size() > 0) {
+						for (String folder : folders) {
+							collectResource(folder, resources, monitor);
+						}
+					} else {
+						collectResource(NODE_MODULES, resources, monitor);
+					}
+
+					return resources;
+				}
+
+				private void collectResource(String folder, List<IResource> resources, IProgressMonitor monitor)
+						throws CoreException {
+					IFolder resource = container.getFolder(new Path(folder));
+					resource.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+					if (resource.exists()) {
+						resources.add(resource);
+					}
+				}
 			}.schedule();
+
+		}
+	}
+
+	@Override
+	public void onTrace(String line) {
+		int index = line.indexOf(NODE_MODULES);
+		if (index != -1) {
+			String folder = line.substring(index, line.length()).trim();
+			folders.add(folder);
 		}
 	}
 

eclipse/terminal/ts.eclipse.ide.terminal.interpreter/src/ts/eclipse/ide/terminal/interpreter/UIInterpreterHelper.java

@@ -17,6 +17,9 @@
  */
 public class UIInterpreterHelper {
 
+	private final static String[] DEFAULT_VIEW_IDS = { IPageLayout.ID_PROJECT_EXPLORER,
+			"org.eclipse.ui.views.ResourceNavigator" };
+
 	/**
 	 * Open in an editor the given file.
 	 * 
@@ -32,12 +35,15 @@ public static void openFile(IFile file) throws PartInitException {
 	}
 
 	/**
-	 * Select the given element in the Project Explorer.
+	 * Select the given element in the default view (Project Explorer,
+	 * Navigator).
 	 * 
 	 * @param element
 	 */
-	public static void selectRevealInProjectExplorer(Object element) {
-		selectReveal(element, IPageLayout.ID_PROJECT_EXPLORER);
+	public static void selectRevealInDefaultViews(Object element) {
+		for (String viewId : DEFAULT_VIEW_IDS) {
+			selectReveal(element, viewId);
+		}
 	}
 
 	/**

eclipse/terminal/ts.eclipse.ide.terminal.interpreter/src/ts/eclipse/ide/terminal/interpreter/internal/jobs/RefreshContainerJob.java

@@ -33,7 +33,7 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
 			}
 		}
 		// Select the container in the Project Explorer
-		UIInterpreterHelper.selectRevealInProjectExplorer(container);
+		UIInterpreterHelper.selectRevealInDefaultViews(container);
 		return Status.OK_STATUS;
 	}
 }