From e1cc81fbd6b57102710aa23dd828e707e1f74f34 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 6 Jul 2018 08:16:48 -0400 Subject: [PATCH] Prevent Output panel from stealing focus Fixes https://github.com/sbt/sbt/issues/4247 Ref https://github.com/Microsoft/vscode/issues/31474 --- vscode-sbt-scala/client/package-lock.json | 2 +- vscode-sbt-scala/client/package.json | 2 +- vscode-sbt-scala/client/src/extension.ts | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/vscode-sbt-scala/client/package-lock.json b/vscode-sbt-scala/client/package-lock.json index 7b49514a7..c4d5cc509 100644 --- a/vscode-sbt-scala/client/package-lock.json +++ b/vscode-sbt-scala/client/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-sbt-scala", - "version": "0.1.0", + "version": "0.2.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/vscode-sbt-scala/client/package.json b/vscode-sbt-scala/client/package.json index f4316539e..5ebfb2dd0 100644 --- a/vscode-sbt-scala/client/package.json +++ b/vscode-sbt-scala/client/package.json @@ -1,7 +1,7 @@ { "name": "vscode-sbt-scala", "displayName": "Scala (sbt)", - "version": "0.2.0", + "version": "0.2.2", "author": "Lightbend, Inc.", "license": "BSD-3-Clause", "publisher": "lightbend", diff --git a/vscode-sbt-scala/client/src/extension.ts b/vscode-sbt-scala/client/src/extension.ts index ff8206a37..987504520 100644 --- a/vscode-sbt-scala/client/src/extension.ts +++ b/vscode-sbt-scala/client/src/extension.ts @@ -7,7 +7,13 @@ let fs = require('fs'), os = require('os'); import * as vscode from 'vscode'; import { ExtensionContext, workspace } from 'vscode'; // workspace, -import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient'; +import { + LanguageClient, + LanguageClientOptions, + RevealOutputChannelOn, + ServerOptions, + TransportKind +} from 'vscode-languageclient'; let terminal: vscode.Terminal = null; @@ -53,6 +59,7 @@ export async function activate(context: ExtensionContext) { // Options to control the language client let clientOptions: LanguageClientOptions = { documentSelector: [{ language: 'scala', scheme: 'file' }, { language: 'java', scheme: 'file' }], + revealOutputChannelOn: RevealOutputChannelOn.Never, initializationOptions: () => { return discoverToken(); }