Make sure we don't load internal files

slint-ui · Jun 16, 2023 · 300cb06 · 300cb06
1 parent bbfbff9
commit 300cb06
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/internal/compiler/tests/syntax/imports/import_builtin.slint b/internal/compiler/tests/syntax/imports/import_builtin.slint
@@ -0,0 +1,6 @@
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
+
+// Even if that file exist in the style, it shouldn't be loaded
+import { StyleMetrics } from "std-widgets-impl.slint";
+//                           ^error{Cannot find requested import "std-widgets-impl.slint" in the include search path}
diff --git a/internal/compiler/typeloader.rs b/internal/compiler/typeloader.rs
@@ -535,7 +535,11 @@ impl TypeLoader {
                     }
                 }
             }))
-            .chain(std::iter::once_with(|| format!("builtin:/{}", self.style).into()))
+            .chain(
+                (file_to_import == "std-widgets.slint"
+                    || referencing_file.map_or(false, |x| x.starts_with("builtin:/")))
+                .then(|| format!("builtin:/{}", self.style).into()),
+            )
             .find_map(|include_dir| {
                 let candidate = include_dir.join(file_to_import);
                 crate::fileaccess::load_file(&candidate).map(|virtual_file| {