Fix #107

Author: octref

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.3.1 | 2019-05-07
+
+- Dispose selection sync after closing Polacode window so selection no longer jams clipboard. #107.
+
 ### 0.3.0 | 2019-05-07
 
 - Major rewrite. See features in [#105](https://github.com/octref/polacode/pull/105).

src/extension.js

@@ -28,7 +28,10 @@ function activate(context) {
         innerHTML: state.innerHTML,
         bgColor: context.globalState.get('polacode.bgColor', '#2e3440')
       })
-      setupSelectionSync()
+      const selectionListener = setupSelectionSync()
+      panel.onDidDispose(() => {
+        selectionListener.dispose()
+      })
       setupMessageListeners()
     }
   })
@@ -41,6 +44,11 @@ function activate(context) {
 
     panel.webview.html = getHtmlContent(htmlPath)
 
+    const selectionListener = setupSelectionSync()
+    panel.onDidDispose(() => {
+      selectionListener.dispose()
+    })
+
     setupMessageListeners()
 
     const fontFamily = vscode.workspace.getConfiguration('editor').fontFamily
@@ -60,8 +68,6 @@ function activate(context) {
     }
   })
 
-  setupSelectionSync()
-
   function setupMessageListeners() {
     panel.webview.onDidReceiveMessage(({ type, data }) => {
       switch (type) {
@@ -102,7 +108,7 @@ function activate(context) {
 
   function syncSettings() {
     const settings = vscode.workspace.getConfiguration('polacode')
-    const editorSettings = vscode.workspace.getConfiguration('editor')
+    const editorSettings = vscode.workspace.getConfiguration('editor', null)
     panel.webview.postMessage({
       type: 'updateSettings',
       shadow: settings.get('shadow'),
@@ -114,7 +120,7 @@ function activate(context) {
   }
 
   function setupSelectionSync() {
-    vscode.window.onDidChangeTextEditorSelection(e => {
+    return vscode.window.onDidChangeTextEditorSelection(e => {
       if (e.selections[0] && !e.selections[0].isEmpty) {
         vscode.commands.executeCommand('editor.action.clipboardCopyAction')
         panel.postMessage({