Issue13 #38

pascalfoerster · 2023-06-26T08:08:06Z

fixes issue #13

All data in the current directory and all subdirectories are no longer loaded. Instead, now only the opened uvl files and the files imported there are loaded.

To make this possible, namespaces are no longer taken into account during import, but only the path with the file name.
If the uvl.json was opened and the corresponding uvl file was not loaded yet, it will be loaded afterward.

Hints:

The automatic completion during import for not-loaded files had to be implemented additionally. Since there are often problems with the file system with different operating systems, and it has only been tested with Linux so far, this still needs to be tested with Windows.

pascalfoerster · 2023-06-27T10:44:37Z

What is the best way to test this?

it is advantageous to have a folder open with as many uvl files as possible
it is especially important to open uvl files that import other uvl files, these should be loaded from the server then. It is best to import uvl files with errors or warnings, because the errors are optimally captured in the problem bar.
then the autocomplete for imports should be tested, so that it is checked whether files that are not loaded are displayed.
if the uvl.json is opened but the corresponding uvl file is not loaded from the server yet, this should be done right after opening the JSON file and no error message should appear.
you can test if the namespaces are ignored during import and it works only with the correct filename(path).

ThiBruUU · 2023-06-27T14:20:07Z

Do you have a folder with many uvl files that you can share with us. Maybe as a zip file?

pascalfoerster · 2023-06-27T15:04:04Z

I used the uvl files from this repo: https://github.com/SoftVarE-Group/feature-model-benchmark/tree/scripts_overhaul/feature_models/uvl

TobiUUlm · 2023-06-27T16:06:02Z

I guess there are still (or again) issues with the Windows File System.
The imports don't work at all and can not be resolved.

Could you please tell us, where exactly file accesses happen? That way we can resolve the issue on our systems.

Additionally, where did you find files with a lot of imports? I think the repo you mentioned does not have a single file with any imports.

pascalfoerster · 2023-06-28T08:18:30Z

The problem shown should give these error messages because namespaces are ignored. It should be Mendonca2009 or Perreira2016 as the import, then it should work. Auto-completion should actually show the correct names. If there is a problem with the file system there too, this is handled in completion::994 with the method from cache::273 all_sub_files(...).

If you still get error messages, then the file access is done in pipeline::506 in the method loade_imports(...).

I also don't have an UVL file with many imports.

…bility-Language#13

TobiUUlm · 2023-06-30T14:32:49Z

it is advantageous to have a folder open with as many uvl files as possible

i opened the suggested files from the big uvl collection

it is especially important to open uvl files that import other uvl files, these should be loaded from the server then. It is best to import uvl files with errors or warnings, because the errors are optimally captured in the problem bar.

Seems to work

then the autocomplete for imports should be tested, so that it is checked whether files that are not loaded are displayed.

Worked only if the files have been opened before once. Probably a windows issue, i suspect.

EDIT: I think I fixed it on windows with the latest commit.
However, there's still an issue with the autocompletion: it suggests finance\bank\AlHajjaji2019 but it should be finance.bank.AlHajjaji2019 with dots, am I right?
Otherwise it won't be resolved as an import.

if the uvl.json is opened but the corresponding uvl file is not loaded from the server yet, this should be done right after opening the JSON file and no error message should appear.

I think this is a windows issue after all:

EDIT: I think i "fixed" this issue but it's not pretty at all and I don't know if it works properly.
Currently, it only works if the corresponding .uvl file is also explicitly opened in the editor.
Is it the same on Linux? @pascalfoerster

you can test if the namespaces are ignored during import and it works only with the correct filename(path).

Namespaces are not recognized correctly. It says namespace already defined for most of them (oddly not for all)

TobiUUlm · 2023-06-30T14:34:45Z

uvls/src/ide/completion.rs

+                    name,
+                    path.clone(),
+                    len,
+                    TextOP::Put(path),


I think you should replace the slashes with dots here for proper completion

yes should actually be so, just made a mistake that should be fixed in the next push

TobiUUlm · 2023-06-30T14:36:12Z

uvls/src/core/ast/transform.rs

-        path.extend_from_slice(&ns.names);
-    }
+    let path = uri_to_path(&uri).unwrap();
+    // without this Code namespaces are ignored for imports and the normal path is used 


I think it's a good idea to keep this within the code.
Does this work like a "switch" or does it need additional changes to make the import work like before?

ThiBruUU

LGTM

pascalfoerster · 2023-07-05T09:30:17Z

However, there's still an issue with the autocompletion: it suggests finance\bank\AlHajjaji2019 but it should be finance.bank.AlHajjaji2019 with dots, am I right?

you are right

I think i "fixed" this issue but it's not pretty at all and I don't know if it works properly.
Currently, it only works if the corresponding .uvl file is also explicitly opened in the editor.
Is it the same on Linux?

In Linux it works even without the UVL file loaded

Namespaces are not recognized correctly. It says namespace already defined for most of them (oddly not for all)

The next push should fix this error

TobiUUlm · 2023-07-06T14:33:55Z

I think i "fixed" this issue but it's not pretty at all and I don't know if it works properly.
Currently, it only works if the corresponding .uvl file is also explicitly opened in the editor.
Is it the same on Linux?

In Linux it works even without the UVL file loaded

Now I can not reproduce it anymore. With a small sample file the configuration works without problems. Maybe it takes too long to index all files.

Waiting for the next push, after that it's good to merge.

felixrieg · 2023-07-31T10:53:38Z

I did as suggested and had some probelms:

it is especially important to open uvl files that import other uvl files, these should be loaded from the server then. It is best to import uvl files with errors or warnings, because the errors are optimally captured in the problem bar.

I have the same issue as tobi had: Worked only if the files have been opened before once. Probably a windows issue, i suspect.

then the autocomplete for imports should be tested, so that it is checked whether files that are not loaded are displayed.

This worked but when i initially open my ide in a folder all the imports get taged as: unresolved import. As soon as I retype one letter all unresolved import errors disappear, but errors in those files still not show.

I also have some really weird bugs:

I cant configure a uvl file with imports, It says: Loading Model and the Log says: successfully cancelled request with ID: 60
If I open IDE in a uvl file with imports, there is no error detection in any of the imported files until I open ALL the imported files first. Other files still have error detection.
I don't know if this should be a separate issue: If I delete a File with a error and then delete said file, the error is still shown at the bottom of vs code.

This said, I don't have any of the above mentioned issues on MacOS, except for the delete file issue.

I have the log for a uvl file with 3 imports, one of which has an error:

INFO [uvls] UVLS start
INFO [uvls] create service
INFO [uvls::core::pipeline] started link handler
INFO [uvls::core::pipeline] started link execute
INFO [uvls::webview] Starting web handler
INFO [uvls::smt] Check SMT
INFO [uvls] received did_open Url { scheme: "file", cannot_be_a_base: false, username: "", password: None, host: None, port: None, path: "/c%3A/Users/felix/Documents/Programmieren/UVL/test.uvl", query: None, fragment: None }
INFO [uvls::core::semantic] file id: test.uvl
INFO [uvls] done did_open
INFO [uvls::core::parse] Parsed in 12.3027ms
INFO [uvls::core::pipeline] started draft handler file:///c%3A/Users/felix/Documents/Programmieren/UVL/test.uvl
INFO [uvls::core::pipeline] update red tree file:///c%3A/Users/felix/Documents/Programmieren/UVL/test.uvl
INFO [uvls::core::check]  check sanity in 499µs
INFO [uvls::core::pipeline] waited 377.4µs for draft
INFO [uvls::core::pipeline] link prepare
INFO [uvls::core::pipeline] link execute
INFO [uvls::core::cache] Cant find [u!("error")] 
INFO [uvls::core::cache] Cant find [u!("test3")] 
INFO [uvls::core::cache] Cant find [u!("test2")] 
INFO [uvls::core::cache] updating cache dirty {test.uvl}
INFO [uvls::smt] Check SMT
INFO [uvls] update inlays Range { start: Position { line: 0, character: 0 }, end: Position { line: 12, character: 10 } }
INFO [uvls::ide::inlays] inlays get
INFO [uvls::ide::inlays] inlays done
INFO [uvls::core::semantic] file id: test.uvl

felixrieg · 2023-09-01T14:23:20Z

I played around with this feature and at first it worked as intended, but then I came across a weird bug.

I made a screen recording for better understanding.
This bug happened for me on windows 11 and Mac.
First I made two error files (error.uvl and error2.uvl) each containing an error.
Then I made an import file importing some arbitrary files and error.uvl. I restarted the server and when trying to import error2.uvl as well in this file it stopped working until I remove the last import.

Screen.Recording.2023-09-01.at.16.14.08.mov

Here are logs after typing the import and I also clicked on the error2.uvl afterwards (Not the logs from the video):

INFO [uvls::core::parse] Parsed in 1.50175ms
INFO [uvls::core::pipeline] update red tree file:///Volumes/SSD-ext/RANDOM/import.uvl
INFO [uvls::core::check]  check sanity in 204.667µs
INFO [uvls::core::semantic] file id: Test2.uvl
INFO [uvls::core::semantic] file id: error.uvl
INFO [uvls::core::semantic] file id: error2.uvl
INFO [uvls::core::parse] Parsed in 254.583µs
INFO [uvls::core::pipeline] started draft handler file:///Volumes/SSD-ext/RANDOM/error2.uvl
INFO [uvls::core::pipeline] update red tree file:///Volumes/SSD-ext/RANDOM/error2.uvl
INFO [uvls::core::check]  check sanity in 87.916µs
INFO [uvls::core::pipeline] link prepare
INFO [uvls::core::pipeline] link execute
INFO [uvls::core::cache] updating cache dirty {error2.uvl, import.uvl}
INFO [uvls::smt] Check SMT
INFO [uvls::smt::smt_lib] expr Var(14)
INFO [uvls::smt::smt_lib] model to string  in 194.166µs
INFO [uvls::smt] create model: 610.709µs
INFO [uvls::core::semantic] file id: import.uvl
INFO [uvls::core::pipeline] waited 143.709µs for draft
INFO [uvls::core::semantic] file id: import.uvl
INFO [uvls::core::pipeline] waited 83.125µs for root
INFO [uvls::ide::color] Semantic highlight took 701.75µs
INFO [uvls::core::pipeline] waited 215.459µs for draft
INFO [uvls] update inlays Range { start: Position { line: 0, character: 0 }, end: Position { line: 26, character: 4 } }
INFO [uvls::ide::inlays] inlays get
INFO [uvls::ide::inlays] inlays done
INFO [uvls] received did_open Url { scheme: "file", cannot_be_a_base: false, username: "", password: None, host: None, port: None, path: "/Volumes/SSD-ext/RANDOM/error2.uvl", query: None, fragment: None }
INFO [uvls::core::semantic] file id: error2.uvl
INFO [uvls] done did_open
INFO [uvls::core::parse] Parsed in 118.25µs
INFO [uvls::core::pipeline] started draft handler file:///Volumes/SSD-ext/RANDOM/error2.uvl
INFO [uvls::core::pipeline] update red tree file:///Volumes/SSD-ext/RANDOM/error2.uvl
INFO [uvls::core::check]  check sanity in 38.25µs
INFO [uvls::core::pipeline] waited 95.917µs for draft
INFO [uvls::core::semantic] file id: error2.uvl
INFO [uvls::core::pipeline] waited 51.875µs for root
INFO [uvls::ide::color] Semantic highlight took 89.417µs
INFO [uvls::core::pipeline] waited 43.875µs for draft
INFO [uvls::core::pipeline] link prepare
INFO [uvls::core::pipeline] link execute
INFO [uvls::core::cache] updating cache dirty {error2.uvl, import.uvl}
INFO [uvls] update inlays Range { start: Position { line: 0, character: 0 }, end: Position { line: 6, character: 10 } }
INFO [uvls::smt] Check SMT
INFO [uvls::ide::inlays] inlays get
INFO [uvls::ide::inlays] inlays done
INFO [uvls::smt::smt_lib] expr Var(14)
INFO [uvls::smt::smt_lib] model to string  in 114.084µs
INFO [uvls::smt] create model: 773.708µs
INFO [uvls::core::semantic] file id: error2.uvl

felixrieg · 2023-10-13T13:20:54Z

LGTM!

pascalfoerster and others added 11 commits May 22, 2023 12:29

add feat load imports

f99ab90

add feat simple file loading

21c6a9d

update load files from uvl.json

8b2fc72

update auto completion import

5da1ad8

update auto completion imports and load uvl.json

fdaed84

add comments for auto completion imports

3abedc0

fix auto completion for not loaded files and dir

278e8bb

Merge branch 'master' into issue13

2a41836

Merge branch 'Universal-Variability-Language:master' into issue13

4afb2c8

fix copy create problem

f7db1d4

remove nameapce by imports

808363c

pascalfoerster requested review from TobiUUlm and ThiBruUU June 26, 2023 08:08

TobiUUlm added 2 commits June 30, 2023 15:15

add windows support.. (again) Universal-Variability-Language#13

c615e30

add (ugly) windows support for configurations (again) Universal-Varia…

ea4b341

…bility-Language#13

TobiUUlm suggested changes Jun 30, 2023

View reviewed changes

Merge branch 'Universal-Variability-Language:master' into issue13

bcd1cd8

ThiBruUU approved these changes Jul 4, 2023

View reviewed changes

pascalfoerster added 2 commits July 4, 2023 13:07

add windows support for completion

3256ecb

fix namspace problem

aa06d2c

remove unused code

b2f87ca

TobiUUlm mentioned this pull request Jul 6, 2023

Issue1 #36

Merged

pascalfoerster added 5 commits July 17, 2023 14:56

fix client bug

10cd659

add new import load technique

4e2cd5f

Merge branch 'master' into issue13

e851463

fix merg errors

36c7923

run formatter

99a05eb

pascalfoerster requested a review from felixrieg July 25, 2023 10:25

pascalfoerster and others added 7 commits August 7, 2023 11:49

Merge branch 'Universal-Variability-Language:master' into issue13

292e956

fix import bug windows

4553165

Merge branch 'master' into issue13

c4a200e

Merge branch 'Universal-Variability-Language:master' into issue13

3e1d108

fix linux autocompletion bug

b580571

remove mut

874c3ce

fix load json.uvl bug for windows

6e2a868

pascalfoerster marked this pull request as draft September 4, 2023 14:08

pascalfoerster and others added 5 commits September 18, 2023 15:27

Merge branch 'master' into issue13

724d5f8

run cargo fmt

56216ec

Merge branch 'Universal-Variability-Language:master' into issue13

30d3153

add syncronisation for import handler

9b4da07

clean up

bd1df22

pascalfoerster marked this pull request as ready for review September 26, 2023 10:13

SundermannC self-requested a review September 26, 2023 10:14

pascalfoerster added 3 commits October 17, 2023 14:38

Merge branch 'master' into issue13

625eaaf

fix merge fail

91511da

fix bug after merge

e39911e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue13 #38

Issue13 #38

pascalfoerster commented Jun 26, 2023

pascalfoerster commented Jun 27, 2023 •

edited

Loading

ThiBruUU commented Jun 27, 2023

pascalfoerster commented Jun 27, 2023

TobiUUlm commented Jun 27, 2023

pascalfoerster commented Jun 28, 2023

TobiUUlm commented Jun 30, 2023

TobiUUlm Jun 30, 2023

pascalfoerster Jul 5, 2023

TobiUUlm Jun 30, 2023

ThiBruUU left a comment

pascalfoerster commented Jul 5, 2023

TobiUUlm commented Jul 6, 2023

felixrieg commented Jul 31, 2023

felixrieg commented Sep 1, 2023

felixrieg commented Oct 13, 2023

Issue13 #38

Are you sure you want to change the base?

Issue13 #38

Conversation

pascalfoerster commented Jun 26, 2023

pascalfoerster commented Jun 27, 2023 • edited Loading

ThiBruUU commented Jun 27, 2023

pascalfoerster commented Jun 27, 2023

TobiUUlm commented Jun 27, 2023

pascalfoerster commented Jun 28, 2023

TobiUUlm commented Jun 30, 2023

TobiUUlm Jun 30, 2023

Choose a reason for hiding this comment

pascalfoerster Jul 5, 2023

Choose a reason for hiding this comment

TobiUUlm Jun 30, 2023

Choose a reason for hiding this comment

ThiBruUU left a comment

Choose a reason for hiding this comment

pascalfoerster commented Jul 5, 2023

TobiUUlm commented Jul 6, 2023

felixrieg commented Jul 31, 2023

felixrieg commented Sep 1, 2023

felixrieg commented Oct 13, 2023

pascalfoerster commented Jun 27, 2023 •

edited

Loading