From d323d6e95f7a74625f2f0d8c27aacb8fb0378c2a Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 16 May 2022 15:49:09 -0700
Subject: [PATCH 1/2] [Logging] Keep 3rd-party debug prints out of production.

---
 org.lflang.diagram/src/log4j.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 org.lflang.diagram/src/log4j.xml

diff --git a/org.lflang.diagram/src/log4j.xml b/org.lflang.diagram/src/log4j.xml
new file mode 100644
index 0000000000..b96f2291a0
--- /dev/null
+++ b/org.lflang.diagram/src/log4j.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
+<log4j:configuration>
+
+    <category name="org.eclipse.xtext.linking.impl">
+        <priority value="off"/>
+    </category>
+
+</log4j:configuration>

From c5f1c74885af6857dc99f09c756b738045547da5 Mon Sep 17 00:00:00 2001
From: Peter Donovan <peterdonovan@berkeley.edu>
Date: Mon, 16 May 2022 16:03:52 -0700
Subject: [PATCH 2/2] [Logging] Dirty hack to make stdout visible in VS Code.

---
 .../src/org/lflang/diagram/lsp/LFLanguageServerExtension.java  | 2 +-
 .../src/org/lflang/diagram/lsp/LanguageDiagramServer.java      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.lflang.diagram/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java b/org.lflang.diagram/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java
index 0a3468f295..7436a157a4 100644
--- a/org.lflang.diagram/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java
+++ b/org.lflang.diagram/src/org/lflang/diagram/lsp/LFLanguageServerExtension.java
@@ -22,7 +22,7 @@
 import org.lflang.util.LFCommand;
 
 /**
- * Provides Lingua-Franca-specific extensions to the
+ * Provide Lingua-Franca-specific extensions to the
  * language server's behavior.
  *
  * @author Peter Donovan <peterdonovan@berkeley.edu>
diff --git a/org.lflang.diagram/src/org/lflang/diagram/lsp/LanguageDiagramServer.java b/org.lflang.diagram/src/org/lflang/diagram/lsp/LanguageDiagramServer.java
index 04f982b106..067d4f2db2 100644
--- a/org.lflang.diagram/src/org/lflang/diagram/lsp/LanguageDiagramServer.java
+++ b/org.lflang.diagram/src/org/lflang/diagram/lsp/LanguageDiagramServer.java
@@ -63,6 +63,9 @@ public void onConnect() {
             rectPack.setClient((KGraphLanguageClient) languageClient);
             LanguageServerErrorReporter.setClient(languageClient);
             lfExtension.setClient(languageClient);
+            // The following is needed because VS Code treats System.err like System.out and System.out like a shout
+            // into the void.
+            System.setOut(System.err);
         }
     }