fix: Update lsp dependencies #1190
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | ||
| <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="output" path="target/classes"/> | ||
| </classpath> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,39 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | ||
| <classpathentry kind="src" output="bin" path="src"> | ||
| <attributes> | ||
| <attribute name="optional" value="true"/> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry exported="true" kind="lib" path="lib/json-simple-1.1.1.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.4.jar" sourcepath="lib/commons-collections4-4.4-sources.jar"> | ||
| <attributes> | ||
| <attribute name="javadoc_location" value="jar:platform:/resource/com.espressif.idf.core/lib/commons-collections4-4.4-javadoc.jar!/"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry exported="true" kind="lib" path="lib/commons-io-2.9.0.jar" sourcepath="lib/commons-io-2.9.0-sources.jar"> | ||
| <attributes> | ||
| <attribute name="javadoc_location" value="jar:platform:/resource/com.espressif.idf.core/lib/commons-io-2.9.0-javadoc.jar!/"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.12.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="lib/snakeyaml-1.30.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="lib/opencsv-5.7.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.4.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="lib/commons-text-1.10.0.jar"/> | ||
| <classpathentry kind="lib" path="lib/commons-compress-1.21.jar"/> | ||
| <classpathentry kind="lib" path="lib/xz-1.9.jar"/> | ||
| <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,6 @@ | |
| import org.eclipse.cdt.core.build.ICBuildConfigurationManager; | ||
| import org.eclipse.cdt.core.build.ICBuildConfigurationProvider; | ||
| import org.eclipse.cdt.core.build.IToolChain; | ||
| import org.eclipse.core.resources.IBuildConfiguration; | ||
| import org.eclipse.core.resources.IProject; | ||
| import org.eclipse.core.runtime.CoreException; | ||
|
|
@@ -27,7 +26,6 @@ | |
|
|
||
| import com.espressif.idf.core.IDFCorePlugin; | ||
| import com.espressif.idf.core.logging.Logger; | ||
|
|
||
| /** | ||
| * @author Kondal Kolipaka <[email protected]> | ||
|
|
@@ -51,80 +49,38 @@ public String getId() | |
| public synchronized ICBuildConfiguration getCBuildConfiguration(IBuildConfiguration config, String name) | ||
| throws CoreException | ||
| { | ||
| ILaunchBarManager barManager = IDFCorePlugin.getService(ILaunchBarManager.class); | ||
| ILaunchTarget target = barManager != null ? barManager.getActiveLaunchTarget() : null; | ||
| if (config.getName().equals(IBuildConfiguration.DEFAULT_CONFIG_NAME)) | ||
| { | ||
| Logger.log("Default config name is not supported"); //$NON-NLS-1$ | ||
| return null; | ||
| } | ||
| IDFBuildConfiguration cmakeConfig = new IDFBuildConfiguration(config, name); | ||
| ICMakeToolChainFile tcFile = cmakeConfig.getToolChainFile(); | ||
| IToolChain toolChain = cmakeConfig.getToolChain(); | ||
| if (toolChain == null) | ||
| { | ||
| Logger.log("Toolchain is null"); //$NON-NLS-1$ | ||
| // config not complete | ||
| return null; | ||
| } | ||
| if (tcFile != null && !toolChain.equals(tcFile.getToolChain())) | ||
| { | ||
| // toolchain changed | ||
| return new IDFBuildConfiguration(config, name, tcFile.getToolChain(), tcFile, cmakeConfig.getLaunchMode(), | ||
| target); | ||
| } | ||
| else | ||
| { | ||
| return cmakeConfig; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public ICBuildConfiguration createCBuildConfiguration(IProject project, IToolChain toolChain, String launchMode, | ||
| ILaunchTarget launchTarget, IProgressMonitor monitor) throws CoreException | ||
|
Comment on lines
+82
to
+83
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainAPI method signature changed and renamed The method has been renamed from 🏁 Script executed: #!/bin/bash
# Check for any other code that might be calling the old method signature
rg "createBuildConfiguration\(" --type javaLength of output: 231 Action Required: Update API Call to the New Method Signature The API method in
Please update this invocation (and any similar references throughout the codebase) to use the new method name and include the required |
||
| { | ||
| // get matching toolchain file if any | ||
| Map<String, String> properties = new HashMap<>(); | ||
|
|
@@ -150,7 +106,7 @@ public ICBuildConfiguration createBuildConfiguration(IProject project, IToolChai | |
| } | ||
|
|
||
| // Let's generate build artifacts directly under the build folder so that CLI and eclipse IDF will be in sync | ||
| String name = ICBuildConfiguration.TOOLCHAIN_ID; | ||
| IBuildConfiguration buildConfig; | ||
| if (configManager.hasConfiguration(this, project, name)) | ||
| { | ||
|
|
@@ -162,7 +118,8 @@ public ICBuildConfiguration createBuildConfiguration(IProject project, IToolChai | |
|
|
||
| } | ||
|
|
||
| CBuildConfiguration cmakeConfig = new IDFBuildConfiguration(buildConfig, name, toolChain, file, launchMode, | ||
| launchTarget); | ||
| configManager.addBuildConfiguration(buildConfig, cmakeConfig); | ||
| return cmakeConfig; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,22 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | ||
| <classpathentry kind="src" output="target/classes" path="src"> | ||
| <attributes> | ||
| <attribute name="optional" value="true"/> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry exported="true" kind="lib" path="svd" sourcepath="svd"/> | ||
| <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="output" path="target/classes"/> | ||
| </classpath> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Verification agent
🧩 Analysis chain
Launch target propagated only on toolchain change
targetis passed to theIDFBuildConfigurationconstructor only when the tool‑chain differs from the CMake tool‑chain file.For the common path (tool‑chains equal) the build configuration will miss the launch target, which can later surface as a
nullwhen resolving debugger paths (compare the stack‑trace shared in the PR discussion).Consider always wiring the launch target:
To verify whether the launch
targetis indeed only wired in the tool‑chain‐change branch, let’s inspect both thenew IDFBuildConfigurationinvocations and thereturn cmakeConfigbranch:🏁 Script executed:
Length of output: 1897
Always wire the launch
targetin both branchesBoth the “toolchain changed” path and the default path currently return different constructors—only the former includes
target. In theelsebranch the launch target is never set, leading to a null later in debugger resolution.Please update in
bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfigurationProvider.javaaround the toolchain‐check:
This ensures
targetis passed into everyIDFBuildConfigurationinstance.📝 Committable suggestion