Skip to content

Commit f409c88

Browse files
authored
Merge pull request #5987 from dotty-staging/vscode-modal
IDE: Make telemetry dialog modal
2 parents afc03c9 + 68d7cc4 commit f409c88

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ object Build {
849849
settings(commonSettings).
850850
settings(
851851
EclipseKeys.skipProject := true,
852-
version := "0.1.14-snapshot", // Keep in sync with package.json
852+
version := "0.1.15-snapshot", // Keep in sync with package.json
853853
autoScalaLibrary := false,
854854
publishArtifact := false,
855855
includeFilter in unmanagedSources := NothingFilter | "*.ts" | "**.json",

vscode-dotty/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vscode-dotty/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "dotty",
33
"displayName": "Dotty Language Server",
44
"description": "IDE integration for Dotty, the experimental Scala compiler",
5-
"version": "0.1.14-snapshot",
5+
"version": "0.1.15-snapshot",
66
"license": "BSD-3-Clause",
77
"publisher": "lampepfl",
88
"repository": {

vscode-dotty/src/tracer.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,11 @@ export class Tracer {
101101
'the content of every Scala file in your project and ' +
102102
'every interaction with Scala files in the IDE, including keystrokes. ' +
103103
'This data will be stored anonymously (we won\'t know your name) on servers at EPFL in Switzerland.',
104-
'Allow', 'Deny',
105-
).then((value: string | undefined) => {
106-
if (value === 'Allow' || value === 'Deny') this.tracingConsent.set(value)
104+
{ 'modal': true },
105+
{ title: 'Allow' },
106+
{ title: 'Deny', isCloseAffordance: true }
107+
).then(value => {
108+
if (value !== undefined && (value.title === 'Allow' || value.title === 'Deny')) this.tracingConsent.set(value.title)
107109
})
108110
}
109111

0 commit comments

Comments
 (0)