From 86f20698b38eeca723312903801b84a032d6e380 Mon Sep 17 00:00:00 2001
From: KWeaver87 <kweaver87@gmail.com>
Date: Tue, 28 Aug 2018 12:23:11 -0400
Subject: [PATCH] Fix for #218

---
 src/extension.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/extension.ts b/src/extension.ts
index ee975af..c2b01b1 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -1,6 +1,6 @@
 import {
     commands, languages, window, workspace, ExtensionContext, Memento,
-    TextEditor, TextEditorSelectionChangeEvent, TextEditorSelectionChangeKind
+    TextEditor, TextEditorSelectionChangeEvent, TextEditorSelectionChangeKind, DiagnosticCollection
     } from "vscode";
 
 import { createDocumentSelector, ExtensionState, Configuration } from "./common";
@@ -14,6 +14,8 @@ import { executeXQuery } from "./xquery-execution/commands";
 
 import * as constants from "./constants";
 
+let diagnosticCollectionXQuery: DiagnosticCollection;
+
 export function activate(context: ExtensionContext) {
     ExtensionState.configure(context);
 
@@ -36,7 +38,9 @@ export function activate(context: ExtensionContext) {
     );
 
     /* Linting Features */
+    diagnosticCollectionXQuery = languages.createDiagnosticCollection(constants.diagnosticCollections.xquery);
     context.subscriptions.push(
+        diagnosticCollectionXQuery,
         window.onDidChangeActiveTextEditor(_handleChangeActiveTextEditor),
         window.onDidChangeTextEditorSelection(_handleChangeTextEditorSelection)
     );
@@ -85,9 +89,7 @@ function _handleContextChange(editor: TextEditor): void {
 
     switch (editor.document.languageId) {
         case constants.languageIds.xquery:
-            languages
-                .createDiagnosticCollection(constants.diagnosticCollections.xquery)
-                .set(editor.document.uri, new XQueryLinter().lint(editor.document.getText()));
+      diagnosticCollectionXQuery.set(editor.document.uri, new XQueryLinter().lint(editor.document.getText()));
             break;
     }
 }