Merge pull request #121 from Krzmbrzl/plugin

finished work on 0.7.1

Author: Krzmbrzl

plugin/Raven.SQDev.Editors/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editors
 Bundle-SymbolicName: raven.sqdev.editors;singleton:=true
-Bundle-Version: 0.6.0
+Bundle-Version: 0.6.2
 Bundle-Activator: raven.sqdev.editors.activator.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

plugin/Raven.SQDev.Editors/bin/raven/sqdev/editors/BasicCodeEditor$1.class

@@ -11,6 +11,8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 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.preference.IPreferenceStore;
 import org.eclipse.jface.text.BadLocationException;
@@ -100,6 +102,8 @@ public class BasicCodeEditor extends TextEditor {
 	 */
 	protected List<CharacterPair> characterPairs;
 
+	private Job parseJob;
+	
 	public BasicCodeEditor() {
 		super();
 
@@ -380,7 +384,43 @@ public boolean parseInput() {
 			return false;
 		}
 
-		Job parseJob = new Job("Parsing \"" + getEditorInput().getName() + "\"...") {
+		if (parseJob != null && parseJob.getState() != Job.NONE) {
+			// Ther previous Job is still running -> reschedule
+			parseJob.addJobChangeListener(new IJobChangeListener() {
+				
+				@Override
+				public void sleeping(IJobChangeEvent event) {
+				}
+				
+				@Override
+				public void scheduled(IJobChangeEvent event) {
+				}
+				
+				@Override
+				public void running(IJobChangeEvent event) {
+				}
+				
+				@Override
+				public void done(IJobChangeEvent event) {
+					// As there has been a request to parse the input again do
+					// it now as the old parsing process is finished
+					parseInput();
+				}
+				
+				@Override
+				public void awake(IJobChangeEvent event) {
+				}
+				
+				@Override
+				public void aboutToRun(IJobChangeEvent event) {
+				}
+			});
+			
+			return false;
+		}
+		
+		parseJob = new Job(
+				"Parsing \"" + getEditorInput().getName() + "\"...") {
 
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {

plugin/Raven.SQDev.Editors/bin/raven/sqdev/editors/BasicCodeEditor$2.class

@@ -1,5 +1,8 @@
 package raven.sqdev.editors;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
@@ -16,11 +19,44 @@
  *
  */
 public class BasicErrorListener extends BaseErrorListener {
+	protected class Error {
+		private int offset;
+		private int length;
+		private String message;
+		
+		public Error(int offset, int length, String message) {
+			this.offset = offset;
+			this.length = length;
+			this.message = message;
+		}
+		
+		public int getOffset() {
+			return offset;
+		}
+		
+		public int getLength() {
+			return length;
+		}
+		
+		public String getMessage() {
+			return message;
+		}
+	}
+	
 	/**
 	 * The editor this listener resports to
 	 */
 	private BasicCodeEditor editor;
 
+	/**
+	 * Indicates whether errors should be suppressed and stored instead of being
+	 * reported
+	 */
+	private boolean suppressErrors;
+	
+	private List<Error> suppressedErrors;
+	
+	
 	/**
 	 * Create an instance of this error listener
 	 * 
@@ -30,11 +66,14 @@ public class BasicErrorListener extends BaseErrorListener {
 	public BasicErrorListener(BasicCodeEditor editor) {
 		Assert.isNotNull(editor);
 		this.editor = editor;
+		
+		suppressedErrors = new ArrayList<Error>();
 	}
 
 	@Override
-	public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
-			int charPositionInline, String msg, RecognitionException e) {
+	public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
+			int line, int charPositionInline, String msg,
+			RecognitionException e) {
 		if (line < 1 || !(offendingSymbol instanceof Token)) {
 			return;
 		}
@@ -44,20 +83,72 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int
 		int length = (offendingToken.getType() == Token.EOF) ? 0
 				: offendingToken.getText().length();
 
-		reportError(offendingToken.getStartIndex(), length, msg);
+		reportError(new Error(offendingToken.getStartIndex(), length, msg));
+	}
+	
+	/**
+	 * Reports an error to the respective editor
+	 * 
+	 * @param error
+	 *            The Error to report
+	 */
+	public void reportError(Error error) {
+		if (suppressErrors) {
+			synchronized (suppressedErrors) {
+				suppressedErrors.add(error);
+			}
+		} else {
+			editor.createMarker(IMarker.PROBLEM, error.getOffset(),
+					error.getLength(), error.getMessage(),
+					IMarker.SEVERITY_ERROR);
+		}
 	}
 
 	/**
 	 * Reports an error to the respective editor
 	 * 
 	 * @param offset
-	 *            The offset of the error start
+	 *            The offset of the error
 	 * @param length
 	 *            The length of the error
 	 * @param msg
 	 *            The error message
 	 */
 	public void reportError(int offset, int length, String msg) {
-		editor.createMarker(IMarker.PROBLEM, offset, length, msg, IMarker.SEVERITY_ERROR);
+		reportError(new Error(offset, length, msg));
+	}
+	
+	/**
+	 * Specifies whether errors should be directly marked or rather be
+	 * suppressed and stored internally
+	 * 
+	 * @param suppress
+	 *            Whether to suppress erros
+	 */
+	public void suppressErrors(boolean suppress) {
+		suppressErrors = suppress;
+	}
+	
+	/**
+	 * Reports all errors that have been suppressed to this point and clears the
+	 * list of suppressed errors
+	 */
+	public void flushSuppressedErros() {
+		synchronized (suppressedErrors) {
+			for (Error currentError : suppressedErrors) {
+				reportError(currentError);
+			}
+			
+			suppressedErrors.clear();
+		}
+	}
+	
+	/**
+	 * Clears the list of suppressed errors
+	 */
+	public void clearSuppressedErrors() {
+		synchronized (suppressedErrors) {
+			suppressedErrors.clear();
+		}
 	}
 }

plugin/Raven.SQDev.Editors/bin/raven/sqdev/editors/BasicCodeEditor$3.class

@@ -30,23 +30,23 @@ public class BasicPartitionScanner extends RuleBasedPartitionScanner {
 	/**
 	 * The rule for a multiline comment
 	 */
-	public static final IPredicateRule MULTILINE_COMMENT_RULE = new MultiLineRule("/*", "*/",
-			new Token(BASIC_COMMENT));
+	public static final IPredicateRule MULTILINE_COMMENT_RULE = new MultiLineRule(
+			"/*", "*/", new Token(BASIC_COMMENT), (char) 0, true);
 	/**
 	 * The rule for a singleline comment
 	 */
-	public static final IPredicateRule SINGLELINE_COMMENT_RULE = new EndOfLineRule("//",
-			new Token(BASIC_COMMENT));
+	public static final IPredicateRule SINGLELINE_COMMENT_RULE = new EndOfLineRule(
+			"//", new Token(BASIC_COMMENT));
 	/**
 	 * The rule for a string encapsulated by double quotation marks
 	 */
-	public static final IPredicateRule DOUBLE_QUOTE_STRING_RULE = new MultiLineRule("\"", "\"",
-			new Token(BASIC_STRING), '\\');
+	public static final IPredicateRule DOUBLE_QUOTE_STRING_RULE = new MultiLineRule(
+			"\"", "\"", new Token(BASIC_STRING), '\\', true);
 	/**
 	 * The rule for a string encapsulated by single quotation marks
 	 */
-	public static final IPredicateRule SINGLE_QUOTE_STRING_RULE = new MultiLineRule("'", "'",
-			new Token(BASIC_STRING));
+	public static final IPredicateRule SINGLE_QUOTE_STRING_RULE = new MultiLineRule(
+			"'", "'", new Token(BASIC_STRING), '\\', true);
 
 	/**
 	 * An array containing all currently used rules

plugin/Raven.SQDev.Editors/bin/raven/sqdev/editors/BasicCodeEditor.class

@@ -154,6 +154,18 @@ public void exitInclude(IncludeContext ctx) {
 					ctx.file.getText().length() - 1);
 			IPath root;
 
+			if (strFilePath.contains("/")) {
+				// backslashes have to be used
+				reportError(ctx.file.getStartIndex() + strFilePath.indexOf("/") + 1,
+						1, ProblemMessages.backslashHasToBeUsed());
+				
+				// Abort because of syntax error
+				return;
+			}
+			
+			// In unix systems the backslash has to be replaced
+			strFilePath = strFilePath.replace("\\", File.separator);
+			
 			if (strFilePath.startsWith("\\")) {
 				root = new Path(SQDevPreferenceUtil.getArmaProgramDirectory());
 			} else {
@@ -174,12 +186,12 @@ public void exitInclude(IncludeContext ctx) {
 				if (!file.isFile()) {
 					// must be a file
 					reportError(includedFileStart, includedFileLength,
-							"Reference is not a file");
+							ProblemMessages.referenceNotAFile());
 				} else {
 					if (includedFiles.contains(filePath)) {
 						// report cycle in hierarchy
 						reportError(includedFileStart, includedFileLength,
-								CYCLE_IN_HIERARCHY_MSG);
+								ProblemMessages.cycleInHierarchy());
 
 						includedFiles.clear();
 

plugin/Raven.SQDev.Editors/bin/raven/sqdev/editors/BasicErrorListener$Error.class

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Misc
 Bundle-SymbolicName: raven.sqdev.misc;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 0.4.2
 Bundle-Activator: raven.sqdev.activator.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.swt,

plugin/Raven.SQDev.Editors/bin/raven/sqdev/editors/BasicErrorListener.class

@@ -231,4 +231,25 @@ public static final String isCaseSensitive(String correct) {
 		return "This operator is case-sensitive! It has to be \"" + correct
 				+ "\"!";
 	}
+	
+	/**
+	 * The error message stating that the reference is not a file
+	 */
+	public static final String referenceNotAFile() {
+		return "Reference is not a file!";
+	}
+	
+	/**
+	 * The error message stating that there is a cycle in hierarchy
+	 */
+	public static final String cycleInHierarchy() {
+		return "Cycle in hierarchy!";
+	}
+	
+	/**
+	 * The error message stating that only a bachslash can be used
+	 */
+	public static final String backslashHasToBeUsed() {
+		return "Only a backslash can be used in this context";
+	}
 }