Remove deprecated Keys enum in slint language

task-jp · Jan 26, 2023 · 5bb84c1 · 5bb84c1
1 parent 5951ae6
commit 5bb84c1
Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/internal/compiler/lookup.rs b/internal/compiler/lookup.rs
@@ -97,7 +97,6 @@ pub enum LookupResult {
 pub enum BuiltinNamespace {
     Colors,
     Math,
-    Keys,
     Key,
     SlintInternal,
 }
@@ -112,7 +111,6 @@ impl LookupResult {
     pub fn deprecated(&self) -> Option<&str> {
         match self {
             Self::Expression { deprecated: Some(x), .. } => Some(x.as_str()),
-            Self::Namespace(BuiltinNamespace::Keys) => Some("Key"),
             _ => None,
         }
     }
@@ -162,7 +160,6 @@ impl LookupObject for LookupResult {
                 (ColorSpecific, ColorFunctions).for_each_entry(ctx, f)
             }
             LookupResult::Namespace(BuiltinNamespace::Math) => MathFunctions.for_each_entry(ctx, f),
-            LookupResult::Namespace(BuiltinNamespace::Keys) => KeysLookup.for_each_entry(ctx, f),
             LookupResult::Namespace(BuiltinNamespace::Key) => KeysLookup.for_each_entry(ctx, f),
             LookupResult::Namespace(BuiltinNamespace::SlintInternal) => {
                 SlintInternal.for_each_entry(ctx, f)
@@ -178,7 +175,6 @@ impl LookupObject for LookupResult {
                 (ColorSpecific, ColorFunctions).lookup(ctx, name)
             }
             LookupResult::Namespace(BuiltinNamespace::Math) => MathFunctions.lookup(ctx, name),
-            LookupResult::Namespace(BuiltinNamespace::Keys) => KeysLookup.lookup(ctx, name),
             LookupResult::Namespace(BuiltinNamespace::Key) => KeysLookup.lookup(ctx, name),
             LookupResult::Namespace(BuiltinNamespace::SlintInternal) => {
                 SlintInternal.lookup(ctx, name)
@@ -733,7 +729,6 @@ impl LookupObject for BuiltinNamespaceLookup {
     ) -> Option<R> {
         None.or_else(|| f("Colors", LookupResult::Namespace(BuiltinNamespace::Colors)))
             .or_else(|| f("Math", LookupResult::Namespace(BuiltinNamespace::Math)))
-            .or_else(|| f("Keys", LookupResult::Namespace(BuiltinNamespace::Keys)))
             .or_else(|| f("Key", LookupResult::Namespace(BuiltinNamespace::Key)))
             .or_else(|| {
                 f("SlintInternal", LookupResult::Namespace(BuiltinNamespace::SlintInternal))

diff --git a/internal/compiler/tests/syntax/lookup/deprecated_property.slint b/internal/compiler/tests/syntax/lookup/deprecated_property.slint
@@ -24,14 +24,4 @@ export Xxx := Rectangle {
 //      ^warning{The property 'color' has been deprecated. Please use 'background' instead}
     }
 
-    Foo := FocusScope {
-        key-pressed(event) => {
-            if (event.text == Keys.Escape) {
-//                            ^warning{The property 'Keys' has been deprecated. Please use 'Key' instead}
-                debug("Esc key was pressed")
-            }
-            accept
-        }
-    }
-
 }
diff --git a/tools/updater/transforms/renames.rs b/tools/updater/transforms/renames.rs
@@ -15,13 +15,20 @@ pub(crate) fn fold_node(
     if kind == SyntaxKind::QualifiedName
         && node.parent().map_or(false, |n| n.kind() == SyntaxKind::Expression)
     {
-        let q = i_slint_compiler::object_tree::QualifiedTypeName::from_node(node.clone().into());
-        if q.to_string() == "PointerEventButton.none" {
+        let q = i_slint_compiler::object_tree::QualifiedTypeName::from_node(node.clone().into())
+            .to_string();
+        if q == "PointerEventButton.none" {
             for t in node.children_with_tokens() {
                 let text = t.into_token().unwrap().to_string();
                 write!(file, "{}", if text == "none" { "other" } else { &text })?;
             }
             return Ok(true);
+        } else if q.starts_with("Keys.") {
+            for t in node.children_with_tokens() {
+                let text = t.into_token().unwrap().to_string();
+                write!(file, "{}", if text == "Keys" { "Key" } else { &text })?;
+            }
+            return Ok(true);
         }
     }