Update trace and error printing to use JythonDev methods.

Author: acardona

src/main/java/org/scijava/plugins/scripteditor/jython/ClassDotAutocompletions.java

@@ -60,7 +60,7 @@ public List<CompletionText> get() {
 			if (fm.isEmpty()) {
 				// Maybe it's a python class
 				// get them all via the org.python.indexer.Indexer and Builtins classes, see StaticDotAutocompletions
-				if( JythonAutocompletionProvider.debug >= 1) System.out.println("Don't know yet how to handle class " + className);
+				JythonDev.print("Don't know yet how to handle class " + className);
 			}
 			ac.addAll(fm);
 		}

src/main/java/org/scijava/plugins/scripteditor/jython/JythonAutocompletionProvider.java

@@ -53,15 +53,6 @@ public class JythonAutocompletionProvider extends DefaultCompletionProvider {
 	private final RSyntaxTextArea text_area;
 	private final ImportFormat formatter;
 
-	/** Adjust value to see debgging information, including:
-	 * 0: nothing at all;
-	 * 1: plus information messages;
-	 * 2: plus {@code Exception} stack traces.
-	 * 
-	 * Defaults to 1.
-	 */
-	static public int debug = 1;
-
 	public JythonAutocompletionProvider(final RSyntaxTextArea text_area, final ImportFormat formatter) {
 		this.text_area = text_area;
 		this.formatter = formatter;
@@ -119,8 +110,8 @@ public List<Completion> getCompletionsImpl(final JTextComponent comp) {
 			if (cs != null) completions.addAll(cs);
 		}
 		catch (Exception e) {
-			if (debug >= 1) System.out.println("Failed to get autocompletions from " + autoCompletions);
-			if (debug >= 2) e.printStackTrace();
+			JythonDev.print("Failed to get autocompletions from " + autoCompletions);
+			JythonDev.printError(e);
 		}
 		// Java class discovery for completions with auto-imports
 		completions.addAll(getCompletions(alreadyEnteredText));
@@ -147,7 +138,7 @@ public List<Completion> getCompletions(final String text) {
 			final String packageName = m2.group(3);
 			String className = m2.group(4); // incomplete or empty, or multiple separated by commas with the last one incomplete or empty
 
-			if (debug >= 2) System.out.println("m2 matches className: " + className);
+			JythonDev.print("m2 matches className: " + className);
 			final String[] bycomma = className.split(",");
 			String precomma = "";
 			if (bycomma.length > 1) {
@@ -277,7 +268,7 @@ private String[] getVariableAnSeedAtCaretLocation() {
 			final String[] varAndSeed = words[words.length - 1].split("\\.");
 			return (varAndSeed.length == 2) ? varAndSeed : new String[] { varAndSeed[varAndSeed.length - 1], "" };
 		} catch (final BadLocationException e) {
-			if (debug >= 2) e.printStackTrace();
+			JythonDev.printError(e);
 		}
 		return null;
 	}

src/main/java/org/scijava/plugins/scripteditor/jython/JythonScriptParser.java

@@ -86,7 +86,7 @@ static public Scope parseAST(final String code) {
 			final mod m = ParserFacade.parse(code, CompileMode.exec, "<none>", new CompilerFlags());
 			return parseNode(m.getChildren(), null, null);
 		} catch (Throwable t) {
-			if (JythonAutocompletionProvider.debug >= 2) t.printStackTrace();
+			JythonDev.printError(t);
 			return new Scope(null);
 		}
 	}
@@ -110,7 +110,7 @@ static public Scope parseNode(final List<PythonTree> children, final Scope paren
 	static public void parseNode(final Scope scope, final List<PythonTree> children, final String className) {
 
 		for (final PythonTree child : children) {
-			print(child.getClass());
+			JythonDev.printTrace(child.getClass());
 
 			if (child instanceof ImportFrom)
 				scope.imports.putAll(parseImportFromStatement( (ImportFrom)child ));
@@ -129,15 +129,15 @@ else if (child instanceof If || child instanceof For || child instanceof While
 				// no new scope in if/for/while/with/try/ statements in python
 				parseNode(scope, child.getChildren(), null);
 			else
-				print("IGNORING child: " + child + " -- " + (null != child.getChildren() ?
+				JythonDev.printTrace("IGNORING child: " + child + " -- " + (null != child.getChildren() ?
 						String.join("::", child.getChildren().stream().map(c -> c.toString()).collect(Collectors.toList()))
 						: ""));
 		}
 	}
 
 	static public void parseExpr(final Expr child, final Scope scope) {
 		// child.getText() shows child is the base
-		print("Expr: " + child.getText() + ", " + child.getInternalValue() + ", " + child.getValue() + ", children: " + String.join(", ", child.getChildren().stream().map(PythonTree::toString).collect(Collectors.toList())));
+		JythonDev.printTrace("Expr: " + child.getText() + ", " + child.getInternalValue() + ", " + child.getValue() + ", children: " + String.join(", ", child.getChildren().stream().map(PythonTree::toString).collect(Collectors.toList())));
 	}
 
 	/**
@@ -169,7 +169,7 @@ static public Map<String, DotAutocompletions> parseImportStatement(final Import
 	}
 
 	static private DotAutocompletions maybeStaticToDot(final PythonTree node, final DotAutocompletions da) {
-		print("children count:" + node.getChildCount() + ", children: " + (null != node.getChildren() ? node.getChildren().stream().map(c -> c.toString()).collect(Collectors.toList()) : ""));
+		JythonDev.printTrace("children count:" + node.getChildCount() + ", children: " + (null != node.getChildren() ? node.getChildren().stream().map(c -> c.toString()).collect(Collectors.toList()) : ""));
 		if (node.getChildCount() > 0 && da instanceof StaticDotAutocompletions) {
 			// It's a right expression (a constructor invocation assigned to a variable on the left) so the left is an instance of the class
 			return new VarDotAutocompletions(da.getClassname());
@@ -196,7 +196,7 @@ static public Map<String, DotAutocompletions> parseAssignStatement(final Assign
 			for (int i=0; i<right.getChildren().size(); ++i) {
 				final CommonTree ct = left.getChildren().get(i).getNode();
 				if (null == ct) {
-					print("null for left: '" + left + "'" + " at child node " + i);
+					JythonDev.printTrace("null for left: '" + left + "'" + " at child node " + i);
 					continue;
 				}
 				final String name = ct.toString();
@@ -303,7 +303,7 @@ static public void parseClassDef(final ClassDef c, final Scope parent) {
 		for (final expr e: c.getInternalBases()) {
 			final DotAutocompletions da = parent.find(e.getText(), null);
 			if (null == da || null == da.getClassname())
-				print("Could not find completions and className for " + e.getText());
+				JythonDev.print("Could not find completions and className for " + e.getText());
 			else
 				superclassNames.add(da.getClassname());
 		}
@@ -376,15 +376,15 @@ static public DotAutocompletions parseRight(final PyObject right, final Scope sc
 						return new VarDotAutocompletions(m.getReturnType().getName());
 				return new VarDotAutocompletions(c.getField(name).getType().getName());
 			} catch (Exception e) {
-				print("Could not find method or field " + name + " in class " + className);
+				JythonDev.print("Could not find method or field " + name + " in class " + className, e);
 			}
 			// Could also be a python module, e.g. attempting to autocomplete "os.path."
 			try {
 				final NModuleType module = Scope.indexer.loadModule(className + "." + name); // overly expensive: any way to check it exists without loading it?
 				if (null != module)
 					return new StaticDotAutocompletions(className  + "." + name);
 			} catch (Exception e) {
-				print("Not a python module: " + className + "." + name);
+				JythonDev.printTrace("Not a python module: " + className + "." + name);
 			}
 		}
 		if (right instanceof Call) {
@@ -398,10 +398,8 @@ static public DotAutocompletions parseRight(final PyObject right, final Scope sc
 			return parseRight(yield.getValue(), scope);
 		}
 
+		JythonDev.printTrace("Unsupported 'right' is: " + right + " " + (right != null ? right.getClass() : ""));
+		
 		return DotAutocompletions.EMPTY;
 	}
-
-	static public final void print(Object s) {
-		if (JythonAutocompletionProvider.debug >= 2) System.out.println(s);
-	}
 }

src/main/java/org/scijava/plugins/scripteditor/jython/StaticDotAutocompletions.java

@@ -54,7 +54,7 @@ public List<CompletionText> get() {
 			try {
 				// Check first if it's a python module
 				final NModuleType module = Scope.loadPythonModule(this.className); // Scope.indexer.getBuiltinModule(this.className);
-				System.out.println("module is: " + module);
+				JythonDev.printTrace("module is: " + module);
 				if (null != module) {
 					module.getTable().keySet().forEach( m -> ac.add(new CompletionText(m)));
 					// Not need to remove: a file system watcher will do so when the module file is updated or deleted.
@@ -89,11 +89,10 @@ public List<CompletionText> get() {
 				}
 
 				if (null != msg) {
-					if (JythonAutocompletionProvider.debug >= 1) System.out.println(msg);
+					JythonDev.print(msg);
 				}
 			} catch (Exception e) {
-				if (null != msg && JythonAutocompletionProvider.debug >= 1) System.out.println(msg);
-				if (JythonAutocompletionProvider.debug >= 2) e.printStackTrace();
+				JythonDev.print(msg, e);
 			}
 		}
 		return ac;

src/main/java/org/scijava/plugins/scripteditor/jython/VarDotAutocompletions.java

@@ -52,7 +52,7 @@ public List<CompletionText> get() {
 				final Class<?> c = Class.forName(className);
 				DotAutocompletions.fieldsAndMethodsInto(c, ac);
 			} catch (final Exception e) {
-				if (JythonAutocompletionProvider.debug >= 2) System.out.println("Could not load class " + className + " :: " + e.getMessage());
+				JythonDev.print("Could not load class " + className, e);
 			}
 		}
 		return ac;