From c1d551f08e23aff02bfdeeda0832e4f429586564 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 25 Feb 2019 17:10:16 +0100 Subject: [PATCH 1/3] IDE: Make telemetry dialog modal VSCode 1.29 made information dialog hide themselves after a few students, so students are likely to miss the dialog, the only way to avoid the timeout is to make the dialog modal. --- vscode-dotty/src/tracer.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/vscode-dotty/src/tracer.ts b/vscode-dotty/src/tracer.ts index c9a110a3465d..62afd4a140a8 100644 --- a/vscode-dotty/src/tracer.ts +++ b/vscode-dotty/src/tracer.ts @@ -101,9 +101,11 @@ export class Tracer { 'the content of every Scala file in your project and ' + 'every interaction with Scala files in the IDE, including keystrokes. ' + 'This data will be stored anonymously (we won\'t know your name) on servers at EPFL in Switzerland.', - 'Allow', 'Deny', - ).then((value: string | undefined) => { - if (value === 'Allow' || value === 'Deny') this.tracingConsent.set(value) + { 'modal': true }, + { title: 'Allow' }, + { title: 'Deny', isCloseAffordance: true } + ).then(value => { + if (value !== undefined && (value.title === 'Allow' || value.title === 'Deny')) this.tracingConsent.set(value.title) }) } From 6e19cc815c9eefcb9e3753524504603936629efa Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 27 Feb 2019 10:16:58 +0100 Subject: [PATCH 2/3] vscode-dotty: Release 0.1.14 --- project/Build.scala | 2 +- vscode-dotty/package-lock.json | 2 +- vscode-dotty/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index a978f784a1c0..5ac9e37ab712 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -849,7 +849,7 @@ object Build { settings(commonSettings). settings( EclipseKeys.skipProject := true, - version := "0.1.14-snapshot", // Keep in sync with package.json + version := "0.1.14", // Keep in sync with package.json autoScalaLibrary := false, publishArtifact := false, includeFilter in unmanagedSources := NothingFilter | "*.ts" | "**.json", diff --git a/vscode-dotty/package-lock.json b/vscode-dotty/package-lock.json index 48c85d48f6c3..c7473dc3d74c 100644 --- a/vscode-dotty/package-lock.json +++ b/vscode-dotty/package-lock.json @@ -1,6 +1,6 @@ { "name": "dotty", - "version": "0.1.14-snapshot", + "version": "0.1.14", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/vscode-dotty/package.json b/vscode-dotty/package.json index 13b0d7cd62fd..cfe7d3853b7b 100644 --- a/vscode-dotty/package.json +++ b/vscode-dotty/package.json @@ -2,7 +2,7 @@ "name": "dotty", "displayName": "Dotty Language Server", "description": "IDE integration for Dotty, the experimental Scala compiler", - "version": "0.1.14-snapshot", + "version": "0.1.14", "license": "BSD-3-Clause", "publisher": "lampepfl", "repository": { From 68d7cc471acf762a50893ddc7eee95dc6793d6cd Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Wed, 27 Feb 2019 10:17:25 +0100 Subject: [PATCH 3/3] vscode-dotty: Bump to 0.1.15-snapshot --- project/Build.scala | 2 +- vscode-dotty/package-lock.json | 2 +- vscode-dotty/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 5ac9e37ab712..99b2cd4d7ccc 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -849,7 +849,7 @@ object Build { settings(commonSettings). settings( EclipseKeys.skipProject := true, - version := "0.1.14", // Keep in sync with package.json + version := "0.1.15-snapshot", // Keep in sync with package.json autoScalaLibrary := false, publishArtifact := false, includeFilter in unmanagedSources := NothingFilter | "*.ts" | "**.json", diff --git a/vscode-dotty/package-lock.json b/vscode-dotty/package-lock.json index c7473dc3d74c..965a4d0af793 100644 --- a/vscode-dotty/package-lock.json +++ b/vscode-dotty/package-lock.json @@ -1,6 +1,6 @@ { "name": "dotty", - "version": "0.1.14", + "version": "0.1.15-snapshot", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/vscode-dotty/package.json b/vscode-dotty/package.json index cfe7d3853b7b..8e2dfbf26c28 100644 --- a/vscode-dotty/package.json +++ b/vscode-dotty/package.json @@ -2,7 +2,7 @@ "name": "dotty", "displayName": "Dotty Language Server", "description": "IDE integration for Dotty, the experimental Scala compiler", - "version": "0.1.14", + "version": "0.1.15-snapshot", "license": "BSD-3-Clause", "publisher": "lampepfl", "repository": {