language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 02:39:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove deprecated Keys enum in slint language

Browse source
This commit is contained in:
Olivier Goffart 2023-01-26 12:58:08 +01:00 • committed by Olivier Goffart
parent 5951ae6272
commit 5bb84c1d69
3 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/compiler/lookup.rs
View file

@ -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))

10
internal/compiler/tests/syntax/lookup/deprecated_property.slint
View file

@ -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
}
}
}