Many changes to OcaIDE

Ocaml/src/ocaml/FolderChangeListener.java

@@ -43,10 +43,11 @@ public boolean visit(IResourceDelta delta) throws CoreException {
 							switch (delta.getKind()) {
 							case IResourceDelta.ADDED: {
 
-								// ignore special directories (.settings, .git, .cvsignore, etc.)
+								// ignore special directories (.settings, .git, .cvsignore, etc.) but not "."
 								IResource r = res;
 								while (r != null) {
-									if (r.getName().startsWith("."))
+									String rName = r.getName();
+									if (rName.startsWith("."))
 										return false;
 									r = r.getParent();
 								}
@@ -55,12 +56,24 @@ public boolean visit(IResourceDelta delta) throws CoreException {
 								if(res.getName().equals("_build"))
 									return false;
 
-								// add this path to the project paths
+								// add this path to the project paths when necessary
 								OcamlPaths paths = new OcamlPaths(project);
 								String[] strPaths = paths.getPaths();
-								String[] newPaths = new String[strPaths.length + 1];
-								System.arraycopy(strPaths, 0, newPaths, 0, strPaths.length);
-								newPaths[strPaths.length] = res.getProjectRelativePath().toPortableString();
+								String resPath = res.getProjectRelativePath().toPortableString();
+
+								boolean needAdd = true;
+								for (String s: strPaths) {
+									if (s.compareTo(resPath) == 0) {
+										needAdd = false;
+										break;
+									}
+								}
+								String[] newPaths = strPaths;
+								if (needAdd) {
+									newPaths = new String[strPaths.length + 1];
+									System.arraycopy(strPaths, 0, newPaths, 0, strPaths.length);
+									newPaths[strPaths.length] = resPath;
+								}
 								paths.setPaths(newPaths);
 
 								break;

Ocaml/src/ocaml/OcamlPlugin.java

@@ -37,6 +37,7 @@
 
 import java.io.File;
 import java.net.URL;
+import java.util.HashMap;
 
 import ocaml.debugging.OcamlDebugger;
 import ocaml.editor.syntaxcoloring.OcamlPartitionScanner;
@@ -51,6 +52,7 @@
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
@@ -72,6 +74,8 @@ public class OcamlPlugin extends AbstractUIPlugin {
 
 	/** The singleton instance of the plug-in. */
 	private static OcamlPlugin instance = null;
+
+	public static HashMap<String, IProgressMonitor> ActiveBuildJobs = new HashMap<>(); 
 
 	/** The directory in which the plug-in was started. */
 	private final String pluginDirectory;
@@ -396,6 +400,11 @@ public static boolean getCommentIsBold() {
 		return instance.getPreferenceStore().getBoolean(PreferenceConstants.P_BOLD_COMMENTS);
 	}
 
+	/** Returns whether comments should appear in bold (from the user preferences) */
+	public static boolean getDocsCommentIsBold() {
+		return instance.getPreferenceStore().getBoolean(PreferenceConstants.P_BOLD_DOCS_COMMENTS);
+	}
+
 	/** Returns whether constants should appear in bold (from the user preferences) */
 	public static boolean getConstantIsBold() {
 		return instance.getPreferenceStore().getBoolean(PreferenceConstants.P_BOLD_CONSTANTS);

Ocaml/src/ocaml/build/graph/CompilerVisitor.java

@@ -22,13 +22,6 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
 
 /**
  * Visit a graph layer by layer, to compile all vertices in the right order.<br>

Ocaml/src/ocaml/build/makefile/OcamlMakefileBuilder.java

@@ -258,8 +258,8 @@ protected IStatus run(IProgressMonitor monitor) {
 						public void run() {
 							try {
 								project.refreshLocal(IProject.DEPTH_INFINITE, null);
-							} catch (CoreException e1) {
-								OcamlPlugin.logError("ocaml plugin error", e1);
+							} catch (Exception e) {
+//								OcamlPlugin.logError("ocaml plugin error", e);
 							}
 						}
 					});

Ocaml/src/ocaml/debugging/OcamlDebugger.java

@@ -76,7 +76,7 @@ public enum State {
 
 	/** The project containing the debugged executable */
 	private IProject project;
-	
+
 	/** list of paths of project */
 	private String[] projectPaths;
 
@@ -240,20 +240,22 @@ public synchronized void start(
 				pathStr = pathStr.trim();
 				if (!".".equals(pathStr)) {
 					commandLineArgs.add("-I");
-					
+
 					//These paths are either absolute or relative to the project
 					//directory. We must convert them to absolute paths in case
 					//we are running a bytecode within a nested directory.
 					Path path = Paths.get(pathStr);
 					if (!path.isAbsolute()) {
 						path = Paths.get(projectLocation.append(pathStr).toOSString());
 					}
-					commandLineArgs.add(path.toString());	
+					commandLineArgs.add(path.toString());
 				}
 			}
 
 			// add the _build folder (for the cases making project by using Ocamlbuild)
 			String buildpath = projectLocation.append("_build").toOSString();
+			commandLineArgs.add("-I");
+			commandLineArgs.add(buildpath);
 			ArrayList<String> buildFolders = FileUtil.findSubdirectories(buildpath);
 			for (String path: buildFolders) {
 				commandLineArgs.add("-I");
@@ -429,7 +431,7 @@ public synchronized void backstepReturn() {
 			send("start");
 		}
 	}
-	
+
 	public synchronized void setFrame(int frame) {
 		if (!checkStarted())
 			return;
@@ -831,7 +833,6 @@ public void run() {
 				refreshEditor();
 				state = State.Idle;
 			}
-
 			else if (state.equals(State.Frame)) {
 				processFrame(output);
 				debuggerOutput.setLength(0);
@@ -903,7 +904,7 @@ else if (state.equals(State.Quitting)) {
 		}
 
 	}
-	
+
 	private void getFrame() {
 		state = State.Frame;
 		send("frame");
@@ -1091,7 +1092,7 @@ private void processFrame(String output) {
 
     public static final Pattern patternCallstack = Pattern
             .compile("\\A#(\\d+)\\s+Pc\\s*:\\s+(\\d+)\\s+(\\w+)\\s+char\\s+(\\d+)");
-    
+
 	private void processCallStack(final String output) {
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
@@ -1138,7 +1139,7 @@ public void run() {
 
 									// prettier stackview
 									String newOutput = "#" + s1 + "  -  " + module + "." + functionName
-														+ "  -  (" + line + ": " + column + ")"; 
+														+ "  -  (" + line + ": " + column + ")";
 									backtrace[i] = newOutput;
 								} else {
 									OcamlPlugin.logError("ocamldebugger: couldn't parse call stack");
@@ -1156,7 +1157,7 @@ public void run() {
 			}
 		});
 	}
-	
+
 	// get function that contains line
 	private synchronized String findFunctionContainingLine(String filepath, int line) {
 		String functionName = "";
@@ -1167,20 +1168,20 @@ private synchronized String findFunctionContainingLine(String filepath, int line
 		int i = 0;
 		for (i = 0; i < childs.size(); i++) {
 			Def def = childs.get(i);
-			int l = Symbol.getLine(def.posStart); 
-			if (l >= line ) 
+			int l = Symbol.getLine(def.posStart);
+			if (l >= line )
 				break;
 		}
 		if (i > 0) {
 			Def child = childs.get(i-1);
 			if (child.type == Def.Type.Let)
 				functionName = child.name;
-			else if (child.type == Def.Type.Module) { 
+			else if (child.type == Def.Type.Module) {
 				List<Def> grandChilds = child.children;
 				int j = 0;
 				for (j = 0; j < grandChilds.size(); j++) {
 					Def def = grandChilds.get(j);
-					int l = Symbol.getLine(def.posStart); 
+					int l = Symbol.getLine(def.posStart);
 					if (l > line)
 						break;
 				}
@@ -1192,7 +1193,7 @@ else if (child.type == Def.Type.Module) {
 		}
 		return functionName;
 	}
-	
+
 	private void indicateRunningState(final String message) {
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
@@ -1213,7 +1214,7 @@ public void run() {
 		DebugMarkers.getInstance().clearCurrentPosition();
 		refreshEditor();
 	}
-	
+
 	private synchronized IEditorInput getEditorInput(final String filename)
 	{
 		String ufilename = filename.substring(0, 1).toUpperCase() + filename.substring(1);
@@ -1277,6 +1278,7 @@ private synchronized String getFilePath(final String filename)
 		return null;
 	}
 
+
 	public void highlight(final String filename, final int offset) {
 		final IEditorInput editorInput = getEditorInput(filename);
 		if (editorInput != null) {
@@ -1446,7 +1448,7 @@ public void run() {
 			}
 		});
 	}
-	
+
 	public void printMessage(final String message) {
 		final IOConsoleOutputStream console = this.console;
 

Ocaml/src/ocaml/debugging/views/OcamlCallStackView.java

@@ -6,8 +6,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Rectangle;
@@ -30,10 +28,10 @@ public void setCallStack(String elements[]){
 		list.removeAll();
 		for(String e : elements)
 			list.add(e);
+		list.setRedraw(true);
 		if (selectionIndex >= 0 && selectionIndex < elements.length) {
 			list.setSelection(selectionIndex);
 		}
-		list.setRedraw(true);
 	}
 
 	public void empty(){

Ocaml/src/ocaml/editor/actions/CancelCompileAllProjectsAction.java

@@ -0,0 +1,91 @@
+package ocaml.editor.actions;
+
+import java.util.Collection;
+
+import ocaml.OcamlPlugin;
+import ocaml.editors.OcamlEditor;
+import ocaml.editors.lex.OcamllexEditor;
+import ocaml.editors.yacc.OcamlyaccEditor;
+import ocaml.util.Misc;
+import ocaml.views.OcamlCompilerOutput;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.IJobChangeListener;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.ui.part.FileEditorInput;
+
+/** This action activates completion in the OCaml editor. */
+public class CancelCompileAllProjectsAction implements IWorkbenchWindowActionDelegate {
+
+	private IWorkbenchWindow window;
+
+	public void run(IAction action) {
+		IWorkbenchPage page = window.getActivePage();
+		if (page != null) {
+			IEditorPart editorPart = page.getActiveEditor();
+			if (editorPart != null) {
+				IProject project = null;
+				FileEditorInput editorInput = (FileEditorInput) editorPart.getEditorInput();
+				if (editorInput != null && editorInput.getFile() != null) {
+					project = editorInput.getFile().getProject();
+				}
+
+				if (project == null)
+					return;
+
+				// show compiler output
+				Misc.showView(OcamlCompilerOutput.ID);
+				// then activate current editor (to resolve shortcut-key issues)
+				page.activate(editorPart);
+
+				final String jobName = "Cancelling compiling jobs";
+
+				Job job = new Job(jobName) {
+					@Override
+					protected IStatus run(IProgressMonitor monitor) {
+						if (!OcamlPlugin.ActiveBuildJobs.isEmpty()) {
+							// cancel all jobs
+							Collection<IProgressMonitor> monitors = OcamlPlugin.ActiveBuildJobs.values();
+							for (IProgressMonitor m: monitors) {
+								m.setCanceled(true);
+							}
+							// clear them from store
+							OcamlPlugin.ActiveBuildJobs.clear();
+						}
+						return Status.OK_STATUS;
+					}
+				};
+
+				job.setPriority(Job.BUILD);
+				job.setUser(action != null);
+				job.schedule(50);
+			}else
+				OcamlPlugin.logError("ContentAssistAction: editorPart is null");
+		} else
+			OcamlPlugin.logError("ContentAssistAction: page is null");
+
+	}
+
+	public void dispose() {
+	}
+
+	public void init(IWorkbenchWindow window) {
+		this.window = window;
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+}