Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor language config loading #1658

Merged

Conversation

sudormrfbin
Copy link
Member

@sudormrfbin sudormrfbin commented Feb 13, 2022

I'm currently implementing #976 and had to access the language configuration in the same way that the editor normally does. This PR factors out the relavant code to functions defined in helix-core.

@sudormrfbin sudormrfbin force-pushed the refactor-lang-config-loading branch from 4213f51 to 9556bd4 Compare February 14, 2022 02:16
@sudormrfbin sudormrfbin force-pushed the refactor-lang-config-loading branch from 9556bd4 to b2bbbc1 Compare February 14, 2022 16:26
@archseer archseer merged commit 4c424d5 into helix-editor:master Feb 14, 2022
@colemickens
Copy link

When building with Nix, I now get a failure:

rust_helix-core> error: aborting due to previous error                            
error: builder for '/nix/store/6lx3j3lllys6h0s1q7sgcz0h2pmwx3yj-rust_helix-core-0.
6.0.drv' failed with exit code 1;                                                 
       last 10 log lines:                                                         
       > error: couldn't read src/../../languages.toml: No such file or directory 
(os error 2)                                                                      
       >  --> src/config.rs:5:22                                                  
       >   |                                                                      
       > 5 |     toml::from_slice(include_bytes!("../../languages.toml"))         
       >   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          
       >   |                                                                      
       >   = note: this error originates in the macro `include_bytes` (in Nightly 
builds, run with -Z macro-backtrace for more info)                   

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants