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

fix(lsp): Improve dependency resolution in context of Nargo.toml #2226

Merged
merged 2 commits into from
Aug 10, 2023

Conversation

phated
Copy link
Contributor

@phated phated commented Aug 8, 2023

Description

Problem*

Resolves #1838

Summary*

This removes lib_hacky.rs in the LSP and replaces it with proper resolution of the Nargo.toml file and the dependencies in the project.

This is still a WIP as I need to consider how we handle encountering a workspace manifest 🤔

Documentation

  • This PR requires documentation updates when merged.

    • I will submit a noir-lang/docs PR.
    • I will request for and support Dev Rel's help in documenting this PR.

Additional Context

PR Checklist*

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt on default settings.

@phated phated force-pushed the phated/remove-nargo-cli-lib branch from db40235 to 31545c7 Compare August 9, 2023 16:11
Base automatically changed from phated/remove-nargo-cli-lib to master August 9, 2023 17:03
@phated phated marked this pull request as ready for review August 9, 2023 22:09
@phated phated requested review from TomAFrench and kobyhallx August 9, 2023 22:09
kobyhallx
kobyhallx previously approved these changes Aug 10, 2023
TomAFrench
TomAFrench previously approved these changes Aug 10, 2023
crates/lsp/src/lib.rs Outdated Show resolved Hide resolved
crates/lsp/src/lib.rs Outdated Show resolved Hide resolved
@TomAFrench TomAFrench enabled auto-merge August 10, 2023 18:35
@TomAFrench TomAFrench added this pull request to the merge queue Aug 10, 2023
Merged via the queue into master with commit 8846bf2 Aug 10, 2023
@TomAFrench TomAFrench deleted the phated/lsp-deps branch August 10, 2023 18:55
TomAFrench added a commit that referenced this pull request Aug 11, 2023
* master: (29 commits)
  feat(nargo): Add support for contracts in `nargo check` (#2267)
  chore(ci): Name wasm job more clearly (#2269)
  chore(ci): Create cache key with consideration to target (#2273)
  chore(ci): Run publish workflow against PRs (#2268)
  chore: Merge in contents of `build-nargo` repository (#2211)
  fix(lsp): Improve dependency resolution in context of `Nargo.toml` (#2226)
  chore: Remove unnecessary duplication in how we test Noir compiler (#2248)
  fix: properly capture lvalues in closure environments (#2120) (#2257)
  fix: Optimize contracts built by `nargo info` (#2259)
  chore: impl Display for DebugType (#2258)
  chore: update `noir_wasm` build process to match `acvm_js` (#2067)
  feat: Implement traits - parser support #2094 (#2230)
  chore: Refactor DefCollector duplicate errors (#2231)
  chore: Address clippy warnings (#2246)
  feat: Support `contract` package type in `nargo info` command (#2249)
  feat: Add slice append (#2241)
  chore: Bump `async-lsp` to v0.0.5 (#2186)
  chore: Move the remaining `nargo_cli` lib funcs into `nargo` crate (#2225)
  chore: Add test for eddsa (#2237)
  chore: Split `Nargo.toml` operations into separate package (#2224)
  ...
TomAFrench added a commit that referenced this pull request Aug 11, 2023
* master:
  feat(nargo): Add support for contracts in `nargo check` (#2267)
  chore(ci): Name wasm job more clearly (#2269)
  chore(ci): Create cache key with consideration to target (#2273)
  chore(ci): Run publish workflow against PRs (#2268)
  chore: Merge in contents of `build-nargo` repository (#2211)
  fix(lsp): Improve dependency resolution in context of `Nargo.toml` (#2226)
  chore: Remove unnecessary duplication in how we test Noir compiler (#2248)
  fix: properly capture lvalues in closure environments (#2120) (#2257)
  fix: Optimize contracts built by `nargo info` (#2259)
  chore: impl Display for DebugType (#2258)
  chore: update `noir_wasm` build process to match `acvm_js` (#2067)
  feat: Implement traits - parser support #2094 (#2230)
  chore: Refactor DefCollector duplicate errors (#2231)
  chore: Address clippy warnings (#2246)
  feat: Support `contract` package type in `nargo info` command (#2249)
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