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

Handle multiple compile commands on client side (needs native server side support) #12960

Open
wants to merge 18 commits into
base: main
Choose a base branch
from

Conversation

yiftahw
Copy link
Contributor

@yiftahw yiftahw commented Nov 13, 2024

closes #7029

DONE:

  • updates to the c_cpp_properties.json schema and compileCommands setting to accept either a string or array of strings.
  • updates to the settings.json schema and default.compileCommands setting to accept either a string or array of strings.
  • a single path with non-zero length in c_cpp_properties.json or settings.json is placed inside an array of length 1.
  • empty strings are filtered from the array of paths, a single empty string or an empty array are handled as undefined.
  • file watcher support for the list of files provided by the user.
  • single compile_commands.json is converted to a list of size 1 to consistently send an array (or undefined).
  • handle squiggles for errors in c_cpp_properties.json.
  • updated C/C++: Edit Configurations (UI) panel to handle multiple compile_commands.json paths.

TODO:

  • closed source server side support by the team?

@yiftahw yiftahw changed the title Handle multiple compile commands on client side Handle multiple compile commands on client side (needs native server side support) Nov 13, 2024
"uniqueItems": true,
"default": []
}
],
"markdownDescription": "Full path to `compile_commands.json` file for the workspace.",
Copy link
Member

Choose a reason for hiding this comment

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

This description should be updated

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated the description, feel free to suggest something different, English is not my native language.

@@ -684,7 +685,7 @@ export class CppProperties {
this.parsePropertiesFile(); // Clear out any modifications we may have made internally.
const config: Configuration | undefined = this.CurrentConfiguration;
if (config) {
config.compileCommands = path;
config.compileCommands = [path];
Copy link
Member

@bobbrow bobbrow Nov 14, 2024

Choose a reason for hiding this comment

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

Question for my team. Do we want to prefer storing the compileCommands property as a string in the actual c_cpp_properties.json file, or as an array? Either way is acceptable here because the json will be reparsed in handleConfigurationChange and converted back to an array.

One other thing to note is that we should change the Edit Configurations UI to make the input for compileCommands be a textarea instead, along with whatever associated changes should come with that. The answer to the question above would also guide the implementation for the storage of the data in the json file. (e.g. if we prefer string for the single entry case, we'd need to test for that when it comes via the UI and react accordingly)

// Start tracking the fallback time for a new path.
this.compileCommandsFileWatcherFallbackTime.set(configuration.compileCommands, new Date());
}
configuration.compileCommands = configuration.compileCommands?.map((path: string) => this.resolvePath(path));
Copy link
Member

Choose a reason for hiding this comment

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

minor: I don't believe you need to use ?. here or on the line below because the existence of configuration.compileCommands was tested before entering this code block.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@yiftahw
Copy link
Contributor Author

yiftahw commented Nov 14, 2024

@bobbrow squiggles are now handled as well. I believe most of the work on the client side is done.
let me know if you have more feedback.

please note there is a new telemetry entry and a new localized string:

message = localize("multiple.paths.should.be.separate.entries", "Multiple paths should be separate entries in an array.");
newSquiggleMetrics.MultiplePathsShouldBeSeparated++;

@yiftahw yiftahw marked this pull request as ready for review November 14, 2024 19:32
}

currentConfiguration.compileCommands?.forEach((file: string) => {
paths.push(`${file}`)
Copy link
Member

Choose a reason for hiding this comment

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

a semicolon is missing on this line.

@bobbrow
Copy link
Member

bobbrow commented Nov 14, 2024

@bobbrow squiggles are now handled as well. I believe most of the work on the client side is done.
let me know if you have more feedback.

Thank you very much. Would you also be able to do the changes to the Edit Configurations UI in Extension/ui/settings.* so that multiple paths can be displayed/edited in that view?

@yiftahw
Copy link
Contributor Author

yiftahw commented Nov 14, 2024

looking into it... putting the PR back to draft for now

@yiftahw yiftahw marked this pull request as draft November 14, 2024 20:05
@yiftahw
Copy link
Contributor Author

yiftahw commented Nov 14, 2024

@bobbrow updated the UI panel.
note: adding a single path in the UI will save it as an array of size 1 (similar to how includePath is handled)

@yiftahw yiftahw marked this pull request as ready for review November 14, 2024 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Pull Request
Development

Successfully merging this pull request may close these issues.

Support multiple compile commands files per project
2 participants