Convert wiki to markdown in LangServ

Author: LadyCailin

src/main/java/com/laytonsmith/core/exceptions/StackTraceManager.java

@@ -49,12 +49,12 @@ public StackTraceManager(GlobalEnv gEnv) {
 	 * @param element The element to be pushed on
 	 */
 	public void addStackTraceFrame(StackTraceFrame element) {
-		elements.add(element);
 		Mixed setting = gEnv.GetRuntimeSetting(MAX_CALL_DEPTH_SETTING, DEFAULT_MAX_DEPTH_MIXED);
 		int maxDepth = ArgumentValidation.getInt32(setting, element.getDefinedAt(), null);
-		if(elements.size() > maxDepth) {
+		if(elements.size() >= maxDepth) {
 			throw new CREStackOverflowError("Stack overflow", element.getDefinedAt());
 		}
+		elements.add(element);
 	}
 
 	/**
@@ -64,6 +64,13 @@ public void popStackTraceFrame() {
 		elements.pop();
 	}
 
+	/**
+	 * Clears all stack trace frames. Used primarily for test cleanup.
+	 */
+	public void clear() {
+		elements.clear();
+	}
+
 	/**
 	 * Returns a copy of the current element list.
 	 *

src/main/java/com/laytonsmith/tools/langserv/LangServModel.java

@@ -56,6 +56,8 @@
 import java.util.concurrent.Executor;
 import org.eclipse.lsp4j.CompletionItem;
 import org.eclipse.lsp4j.CompletionItemKind;
+import org.eclipse.lsp4j.MarkupContent;
+import org.eclipse.lsp4j.MarkupKind;
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.DidChangeTextDocumentParams;
@@ -446,8 +448,9 @@ public void startup() {
 								//					ci.setCommitCharacters(Arrays.asList("("));
 								ci.setKind(CompletionItemKind.Function);
 								ci.setDetail(di.ret);
-								ci.setDocumentation(di.originalArgs + "\n\n" + di.desc
-										+ (di.extendedDesc == null ? "" : "\n\n" + di.extendedDesc));
+								ci.setDocumentation(new MarkupContent(MarkupKind.MARKDOWN,
+										WikiToMarkdown.convert(di.originalArgs + "\n\n" + di.desc
+										+ (di.extendedDesc == null ? "" : "\n\n" + di.extendedDesc))));
 								list.add(ci);
 							}
 							functionCompletionItems = list;
@@ -493,7 +496,8 @@ public void startup() {
 									}
 									description.append("\n");
 								}
-								ci.setDocumentation(description.toString());
+								ci.setDocumentation(new MarkupContent(MarkupKind.MARKDOWN,
+										WikiToMarkdown.convert(description.toString())));
 								list.add(ci);
 							}
 							eventCompletionItems = list;
@@ -507,7 +511,8 @@ public void startup() {
 									CompletionItem ci = new CompletionItem(m.typeof(null).getSimpleName());
 									ci.setKind(CompletionItemKind.TypeParameter);
 									ci.setDetail(m.getName());
-									ci.setDocumentation(m.docs());
+									ci.setDocumentation(new MarkupContent(MarkupKind.MARKDOWN,
+										WikiToMarkdown.convert(m.docs())));
 									ci.setCommitCharacters(Arrays.asList(" "));
 									list.add(ci);
 								} catch(Throwable ex) {