Merge pull request #5987 from dotty-staging/vscode-modal

IDE: Make telemetry dialog modal
scala · Feb 27, 2019 · f409c88 · f409c88
2 parents afc03c9 + 68d7cc4
commit f409c88
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git 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.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
diff --git 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.15-snapshot",
   "license": "BSD-3-Clause",
   "publisher": "lampepfl",
   "repository": {

diff --git 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)
         })
     }