Skip to content

Commit

Permalink
Re-pin LSP tests to published version of std and re-enable commente…
Browse files Browse the repository at this point in the history
…d out tests (#6315)

## Description
closes #4211
closes #6258

## Checklist

- [x] I have linked to any relevant issues.
- [x] I have commented my code, particularly in hard-to-understand
areas.
- [x] I have updated the documentation where relevant (API docs, the
reference, and the Sway book).
- [x] If my change requires substantial documentation changes, I have
[requested support from the DevRel
team](https://github.com/FuelLabs/devrel-requests/issues/new/choose)
- [x] I have added tests that prove my fix is effective or that my
feature works.
- [x] I have added (or requested a maintainer to add) the necessary
`Breaking*` or `New Feature` labels where relevant.
- [x] I have done my best to ensure that my PR adheres to [the Fuel Labs
Code Review
Standards](https://github.com/FuelLabs/rfcs/blob/master/text/code-standards/external-contributors.md).
- [x] I have requested a review from the relevant team or maintainers.
  • Loading branch information
JoshuaBatty authored Jul 31, 2024
1 parent 33134f8 commit a727d1f
Show file tree
Hide file tree
Showing 13 changed files with 124 additions and 148 deletions.
5 changes: 1 addition & 4 deletions sway-lsp/tests/fixtures/tokens/abi/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ name = "abi"
implicit-std = false

[dependencies]
# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
std = { path = "../../../../../sway-lib-std" }
std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }
5 changes: 1 addition & 4 deletions sway-lsp/tests/fixtures/tokens/consts/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ name = "consts"
implicit-std = false

[dependencies]
# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
std = { path = "../../../../../sway-lib-std" }
std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }
5 changes: 1 addition & 4 deletions sway-lsp/tests/fixtures/tokens/fields/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ name = "fields"
implicit-std = false

[dependencies]
# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
std = { path = "../../../../../sway-lib-std" }
std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }
5 changes: 1 addition & 4 deletions sway-lsp/tests/fixtures/tokens/matches/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ name = "matches"
implicit-std = false

[dependencies]
# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
std = { path = "../../../../../sway-lib-std" }
std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }
5 changes: 1 addition & 4 deletions sway-lsp/tests/fixtures/tokens/paths/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ name = "paths"
implicit-std = false

[dependencies]
# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
std = { path = "../../../../../sway-lib-std" }
std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }
2 changes: 1 addition & 1 deletion sway-lsp/tests/fixtures/tokens/paths/src/deep_mod.sw
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
library;

mod deeper_mod;
pub mod deeper_mod;
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ pub enum DeepEnum {
}

pub struct DeepStruct<T> {
field: T,
pub field: T,
}
4 changes: 1 addition & 3 deletions sway-lsp/tests/fixtures/tokens/paths/src/main.sw
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ use std::constants::{self, ZERO_B256};
pub fn fun() {
let _ = std::option::Option::None;
let _ = Option::None;
let _ = std::vm::evm::evm_address::EvmAddress {
value: b256::min(),
};
let _ = std::vm::evm::evm_address::EvmAddress::zero();

test_mod::test_fun();
deep_mod::deeper_mod::deep_fun();
Expand Down
4 changes: 1 addition & 3 deletions sway-lsp/tests/fixtures/tokens/storage/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ name = "storage"
implicit-std = false

[dependencies]
# TODO: Temporarily use the local std before the tests dependencies are bumped to v0.54.1.
# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
std = { path = "../../../../../sway-lib-std" }
std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }
5 changes: 1 addition & 4 deletions sway-lsp/tests/fixtures/tokens/structs/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ name = "structs"
implicit-std = false

[dependencies]
# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
std = { path = "../../../../../sway-lib-std" }
std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }
5 changes: 1 addition & 4 deletions sway-lsp/tests/fixtures/tokens/turbofish/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ name = "turbofish"
implicit-std = false

[dependencies]
# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
std = { path = "../../../../../sway-lib-std" }
std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }
5 changes: 1 addition & 4 deletions sway-lsp/tests/fixtures/tokens/variables/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ name = "variables"
implicit-std = false

[dependencies]
# TODO: This project needs the version of the preludes that uses `pub use` instead of `use`
# Temporarily use the local std before the tests dependencies are bumped to v0.61.3 or v0.62.0.
# std = { git = "https://github.com/FuelLabs/sway", tag = "v0.48.1" }
std = { path = "../../../../../sway-lib-std" }
std = { git = "https://github.com/FuelLabs/sway", tag = "v0.62.0" }
Loading

0 comments on commit a727d1f

Please sign in to comment.