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

Replace references to the .60 files that are now renamed with .slint

Browse source
This commit is contained in:
Olivier Goffart 2022-02-02 09:38:28 +01:00
parent 0c0a783095
commit d706d63ce1
65 changed files with 113 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/compiler/load_builtins.rs
View file

@ -20,7 +20,7 @@ use crate::typeregister::TypeRegister;
/// At this point, it really should already contain the basic Types (string, int, ...)
pub fn load_builtins(register: &mut TypeRegister) {
let mut diag = crate::diagnostics::BuildDiagnostics::default();
let node = crate::parser::parse(include_str!("builtins.60").into(), None, &mut diag);
let node = crate::parser::parse(include_str!("builtins.slint").into(), None, &mut diag);
if !diag.is_empty() {
let vec = diag.to_string_vec();
#[cfg(feature = "display-diagnostics")]

4
internal/compiler/tests/syntax/imports/cyclic_import.slint
View file

@ -2,8 +2,8 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Rec12 } from "../../typeloader/recursive_import1.60";
// ^error{No exported type called 'Rec12' found in ".*recursive_import1.60"}
import { Rec12 } from "../../typeloader/recursive_import1.slint";
// ^error{No exported type called 'Rec12' found in ".*recursive_import1.slint"}
Blah := Rec12 {
// ^error{Unknown type Rec12}
width: 100px;

2
internal/compiler/tests/syntax/imports/error_in_import.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { X } from "../../typeloader/incpath/should_fail2.60";
import { X } from "../../typeloader/incpath/should_fail2.slint";
Foo := Rectangle {
x:= X {

2
internal/compiler/tests/syntax/imports/error_in_import2.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Y } from "../../typeloader/incpath/should_fail3.60";
import { Y } from "../../typeloader/incpath/should_fail3.slint";
Foo := Rectangle {

2
internal/compiler/tests/syntax/imports/error_in_import3.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Z } from "../../typeloader/incpath/should_fail4.60";
import { Z } from "../../typeloader/incpath/should_fail4.slint";
Foo := Rectangle {
Z {

8
internal/compiler/tests/syntax/imports/import_errors.slint
View file

@ -1,16 +1,16 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { NotThere } from "file_not_there.60";
// ^error{Cannot find requested import "file_not_there.60" in the include search path}
import { NotThere } from "file_not_there.slint";
// ^error{Cannot find requested import "file_not_there.slint" in the include search path}
import { NotExported } from "../../typeloader/incpath/local_helper_type.60";
import { NotExported } from "../../typeloader/incpath/local_helper_type.slint";
// ^error{No exported type called 'NotExported' found in ".*\.\./\.\./typeloader/incpath/local_helper_type.60}
import { Nothing } from "";
// ^error{Unexpected empty import url}
import "invalid_export.60";
import "invalid_export.slint";
// ^error{Import names are missing. Please specify which types you would like to import}
import "myimage.png";

4
internal/compiler/tests/syntax/imports/visibility_errors.slint
View file

@ -2,9 +2,9 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SomeRect } from "../../typeloader/incpath/local_helper_type.60";
import { SomeRect } from "../../typeloader/incpath/local_helper_type.slint";
import { X } from "../../typeloader/incpath/should_fail.60";
import { X } from "../../typeloader/incpath/should_fail.slint";
Blah := X {
width: 100px;

2
internal/compiler/tests/typeloader/dependency_local.slint
View file

@ -1,6 +1,6 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { AnotherType } from "./incpath/dependency_from_incpath.60";
import { AnotherType } from "./incpath/dependency_from_incpath.slint";
export SubType := AnotherType {}

4
internal/compiler/tests/typeloader/dependency_test_main.slint
View file

@ -1,8 +1,8 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SubType } from "./dependency_local.60";
import { AnotherType } from "dependency_from_incpath.60";
import { SubType } from "./dependency_local.slint";
import { AnotherType } from "dependency_from_incpath.slint";
export Main := Rectangle {
SubType {}

2
internal/compiler/tests/typeloader/incpath/dependency_from_incpath.slint
View file

@ -1,6 +1,6 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { SomeRect } from "./local_helper_type.60";
import { SomeRect } from "./local_helper_type.slint";
export AnotherType := SomeRect {}

2
internal/compiler/tests/typeloader/recursive_import1.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Rec2 } from "./recursive_import2.60";
import { Rec2 } from "./recursive_import2.slint";
export Rec1 := Rectangle {
property <int> Hello: 42;

2
internal/compiler/tests/typeloader/recursive_import2.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { Rec1 } from "./recursive_import1.60";
import { Rec1 } from "./recursive_import1.slint";
// ^error{Recursive import of .*recursive_import1.60}
export Rec2 := Rectangle {

6
internal/compiler/typeloader.rs
View file

@ -453,7 +453,7 @@ fn test_dependency_loading() {
compiler_config.style = Some("fluent".into());
let mut main_test_path = test_source_path;
main_test_path.push("dependency_test_main.60");
main_test_path.push("dependency_test_main.slint");
let mut test_diags = crate::diagnostics::BuildDiagnostics::default();
let doc_node = crate::parser::parse_file(main_test_path, &mut test_diags).unwrap();
@ -489,7 +489,7 @@ fn test_load_from_callback_ok() {
compiler_config.open_import_fallback = Some(Rc::new(move |path| {
let ok_ = ok_.clone();
Box::pin(async move {
assert_eq!(path, "../FooBar.60");
assert_eq!(path, "../FooBar.slint");
assert!(!ok_.get());
ok_.set(true);
Some(Ok("export XX := Rectangle {} ".to_owned()))
@ -500,7 +500,7 @@ fn test_load_from_callback_ok() {
let doc_node = crate::parser::parse(
r#"
/* ... */
import { XX } from "../FooBar.60";
import { XX } from "../FooBar.slint";
X := XX {}
"#
.into(),

4
internal/compiler/widgets/fluent/std-widgets.slint
View file

@ -1,8 +1,8 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.60";
import { StandardButton } from "../common/standardbutton.60";
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.slint";
import { StandardButton } from "../common/standardbutton.slint";
import { StyleMetrics, ScrollView, Button, Palette } from "std-widgets-impl.slint";
export { StyleMetrics, ScrollView, Button, StandardButton, TextEdit, AboutSixtyFPS }

2
internal/compiler/widgets/native/std-widgets.slint
View file

@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@sixtyfps.io>
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.60";
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.slint";
import { StyleMetrics, ScrollView } from "std-widgets-impl.slint";
export { StyleMetrics, ScrollView, TextEdit, AboutSixtyFPS }

4
internal/compiler/widgets/ugly/std-widgets.slint
View file

@ -2,8 +2,8 @@
// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.60";
import { StandardButton } from "../common/standardbutton.60";
import { LineEditInner, TextEdit, AboutSixtyFPS } from "../common/common.slint";
import { StandardButton } from "../common/standardbutton.slint";
import { StyleMetrics, ScrollView, Button, Palette } from "std-widgets-impl.slint";
export { StyleMetrics, ScrollView, Button, StandardButton, TextEdit, AboutSixtyFPS }