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

IEP-1246 Set --compile-commands-dir=<path> for the current project which the user is trying to build #973

Merged
merged 1 commit into from
Jun 3, 2024

Conversation

sigmaaa
Copy link
Collaborator

@sigmaaa sigmaaa commented May 31, 2024

Description

Set --compile-commands-dir= for the current project which the user is trying to build

Fixes # (IEP-1246)

Type of change

Please delete options that are not relevant.

  • New feature (non-breaking change which adds functionality)

How has this been tested?

Test A:
build project -> check additional lsp options -> --compile-commands-dir points to the right path
Test B:
change the target -> check query drivers -> points to correct toolchain

Test Configuration:

  • ESP-IDF Version:
  • OS (Windows,Linux and macOS):

Dependent components impacted by this PR:

  • LSP editor

Checklist

  • PR Self Reviewed
  • Applied Code formatting
  • Added Documentation
  • Added Unit Test
  • Verified on all platforms - Windows,Linux and macOS

Summary by CodeRabbit

  • New Features

    • Introduced management of Language Server Protocol (LSP) servers, including restarting servers and updating configuration options.
  • Refactor

    • Streamlined dependencies and imports related to LSP services for improved performance and maintainability.
    • Replaced deprecated LSP utility methods with new LspService methods for better functionality.

@sigmaaa sigmaaa self-assigned this May 31, 2024
Copy link

coderabbitai bot commented May 31, 2024

Walkthrough

The changes primarily focus on integrating Language Server Protocol (LSP) support into the Espressif IDF core and UI bundles. Dependencies on LSP-related bundles were added to the core, while redundant dependencies were removed from the UI. Additionally, a new LspService class was introduced to manage LSP servers, and existing methods in LaunchBarListener were refactored to utilize this new service.

Changes

Files Change Summary
bundles/com.espressif.idf.core/META-INF/MANIFEST.MF Added dependencies: org.eclipse.cdt.lsp.clangd, org.eclipse.cdt.lsp, org.eclipse.lsp4e.
bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/... Added LspService import, created LspService instance, updated options, restarted LSP servers.
bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/... Introduced LspService class to manage LSP servers and configurations.
bundles/com.espressif.idf.ui/META-INF/MANIFEST.MF Removed dependencies: com.espressif.idf.lsp, org.eclipse.lsp4e; retained org.eclipse.cdt.lsp.clangd.
bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/LaunchBar... Removed LSP-related imports and methods, replaced with LspService methods.

Sequence Diagram(s) (Beta)

sequenceDiagram
    participant User
    participant LaunchBarListener
    participant LspService
    participant LSPServer

    User->>LaunchBarListener: Initiate Build
    LaunchBarListener->>LspService: restartLspServers()
    LspService->>LSPServer: Restart
    LSPServer->>LspService: Confirm Restart
    LspService->>LaunchBarListener: Servers Restarted
    LaunchBarListener->>User: Build Completed
Loading

Poem

In the realm of code so bright,
LSP servers take flight.
Dependencies align, new paths we find,
With LspService, all in kind.
Code anew, with ease and grace,
Espressif's build, a smoother pace.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 80d54e7 and be17bda.

Files selected for processing (5)
  • bundles/com.espressif.idf.core/META-INF/MANIFEST.MF (1 hunks)
  • bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfiguration.java (2 hunks)
  • bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/LspService.java (1 hunks)
  • bundles/com.espressif.idf.ui/META-INF/MANIFEST.MF (1 hunks)
  • bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/LaunchBarListener.java (4 hunks)
Files skipped from review due to trivial changes (1)
  • bundles/com.espressif.idf.ui/META-INF/MANIFEST.MF
Additional comments not posted (2)
bundles/com.espressif.idf.core/META-INF/MANIFEST.MF (1)

32-34: The addition of LSP-related dependencies aligns with the PR's objectives to enhance LSP functionalities.

bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/LaunchBarListener.java (1)

63-65: Integration of LspService in activeLaunchTargetChanged method is implemented correctly. Ensure this behavior is verified on all supported platforms as mentioned in the PR checklist.

Comment on lines +21 to +68
public class LspService
{
private final Configuration configuration;
private final Stream<LanguageServerWrapper> languageServerWrappers;

public LspService()
{
this(PlatformUI.getWorkbench().getService(ClangdConfiguration.class), LspUtils.getLanguageServers());
}

public LspService(Configuration configuration, Stream<LanguageServerWrapper> languageServerWrappers)
{
this.configuration = configuration;
this.languageServerWrappers = languageServerWrappers;
}

public void restartLspServers()
{
languageServerWrappers.forEach(w -> {
try
{
w.restart();
}
catch (IOException e)
{
Logger.log(e);
}
});
}

public void updateAdditionalOptions(String additionalOptions)
{
if (configuration.metadata() instanceof ClangdMetadata metadata)
{
String qualifier = configuration.qualifier();
InstanceScope.INSTANCE.getNode(qualifier).put(metadata.additionalOptions().identifer(), additionalOptions);
}
}

public void updateLspQueryDrivers()
{
if (configuration.metadata() instanceof ClangdMetadata metadata)
{
String qualifier = configuration.qualifier();
InstanceScope.INSTANCE.getNode(qualifier).put(metadata.queryDriver().identifer(),
metadata.queryDriver().defaultValue());
}
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The implementation of LSP service methods appears correct and efficient. Consider adding unit tests to ensure functionality works as expected under various scenarios.

Would you like me to help with creating unit tests for these methods?

Comment on lines +473 to +475
LspService lspService = new LspService();
lspService.updateAdditionalOptions(String.format("--compile-commands-dir=%s", buildDir)); //$NON-NLS-1$
lspService.restartLspServers();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The integration of LspService and setting of --compile-commands-dir in runCmakeBuildCommand are implemented correctly. Consider adding documentation to describe this new behavior and its impact on the build process.

Would you like help with drafting the documentation?

Copy link
Collaborator

@kolipakakondal kolipakakondal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Collaborator Author

@sigmaaa sigmaaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Self reviewed

@AndriiFilippov
Copy link
Collaborator

@sigmaaa hi!

Tested under:
OS - Windows 10
ESP-IDF: v5.2.1

build project -> check additional lsp options -> --compile-commands-dir points to the right path ✔️
change the target -> check query drivers -> points to correct toolchain ✔️
Also verified with custom build folder ✔️

image

Since we have it as a default, should we remove this hint ?
image

@kolipakakondal
Copy link
Collaborator

Hi @AndriiFilippov We can remove troubleshooting from the build console and move it to clangd documentation area

@kolipakakondal kolipakakondal merged commit 1360574 into master Jun 3, 2024
4 of 6 checks passed
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