search

microsoft / vscode-cpptools

Official repository for the Microsoft C/C++ extension for VS Code.
Other
5.53k stars 1.56k forks source link

Merge multiple compile_commands.json files #12911

Closed yiftahw closed 2 days ago

yiftahw commented 2 weeks ago

Abstract

Usage

define the following entries in .vscode/settings.json: 

// already implemented
"C_Cpp.default.compileCommands": "${workspaceFolder}/build/merged_compile_commands.json",
// new
"C_Cpp.mergeCompileCommands": { 
"sources": [
        "${workspaceFolder}/build/proj1/compile_commands.json",
        "${workspaceFolder}/build/proj2/compile_commands.json",
    ],
    "destination": "${workspaceFolder}/build/merged_compile_commands.json"
},

Why are glob patterns not supported here?

State Machine

stateDiagram-v2 
[*] --> load : settings.json loaded/changed
load : close file watchers<br>load configuration
check_dst: check if destination file exists
load --> check_dst
create : merge compile commands
check_srcs : check if any of the sources<br>is newer than dst
check_dst --> check_srcs : true
check_dst --> create : false
missingbank : periodically check if missing files are created
filewatchers : create source file watchers
check_srcs --> filewatchers: false
check_srcs --> create : true
missingbank --> filewatchers : file created
filewatchers --> missingbank : error<br>file missing
filewatchers --> create : source file changed
filewatchers --> check_dst : error<br>file watcher limit hit
create --> filewatchers : Success
create --> [*] : Error

TODO:

yiftahw commented 2 weeks ago

@microsoft-github-policy-service agree

‫בתאריך יום ה׳, 31 באוק׳ 2024 ב-20:33 מאת ‪microsoft-github-policy-service[bot]‬‏ @.***‬‏>:‬

@yiftahw https://github.com/yiftahw please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.

@microsoft-github-policy-service agree

  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.

@microsoft-github-policy-service agree company="Microsoft"

Contributor License Agreement Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”), and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your contributions to Microsoft open source projects. This Agreement is effective as of the latest signature date below.

  1. Definitions. “Code” means the computer software code, whether in human-readable or machine-executable form, that is delivered by You to Microsoft under this Agreement. “Project” means any of the projects owned or managed by Microsoft and offered under a license approved by the Open Source Initiative (www.opensource.org). “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any Project, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of discussing and improving that Project, but excluding communication that is conspicuously marked or otherwise designated in writing by You as “Not a Submission.” “Submission” means the Code and any other copyrightable material Submitted by You, including any associated comments and documentation.

  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any Project. This Agreement covers any and all Submissions that You, now or in the future (except as described in Section 4 below), Submit to any Project.

  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work. Should You wish to Submit materials that are not Your original work, You may Submit them separately to the Project if You (a) retain all copyright and license information that was in the materials as You received them, (b) in the description accompanying Your Submission, include the phrase “Submission containing materials of a third party:” followed by the names of the third party and any licenses or other restrictions of which You are aware, and (c) follow any other instructions in the Project’s written guidelines concerning Submissions.

  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your Submission is made in the course of Your work for an employer or Your employer has intellectual property rights in Your Submission by contract or applicable law, You must secure permission from Your employer to make the Submission before signing this Agreement. In that case, the term “You” in this Agreement will refer to You and the employer collectively. If You change employers in the future and desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement and secure permission from the new employer before Submitting those Submissions.

  5. Licenses.

    • Copyright License. You grant Microsoft, and those who receive the Submission directly or indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third parties.
    • Patent License. You grant Microsoft, and those who receive the Submission directly or indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under Your patent claims that are necessarily infringed by the Submission or the combination of the Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and import or otherwise dispose of the Submission alone or with the Project.
    • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement. No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are granted by implication, exhaustion, estoppel or otherwise.

  6. Representations and Warranties. You represent that You are legally entitled to grant the above licenses. You represent that each of Your Submissions is entirely Your original work (except as You may have disclosed under Section 3). You represent that You have secured permission from Your employer to make the Submission in cases where Your Submission is made in the course of Your work for Your employer or Your employer has intellectual property rights in Your Submission by contract or applicable law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You have the necessary authority to bind the listed employer to the obligations contained in this Agreement. You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.

  7. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which You later become aware that would make Your representations in this Agreement inaccurate in any respect.

  8. Information about Submissions. You agree that contributions to Projects and information about contributions may be maintained indefinitely and disclosed publicly, including Your name and other information that You submit with Your Submission.

  9. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County, Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all defenses of lack of personal jurisdiction and forum non-conveniens.

  10. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and supersedes any and all prior agreements, understandings or communications, written or oral, between the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

— Reply to this email directly, view it on GitHub https://github.com/microsoft/vscode-cpptools/pull/12911#issuecomment-2450569727, or unsubscribe https://github.com/notifications/unsubscribe-auth/APEFY2P64DHNFDPAYZZQ6YDZ6JZWFAVCNFSM6AAAAABQ64LWWOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDINJQGU3DSNZSG4 . You are receiving this because you were mentioned.Message ID: @.***>

bobbrow commented 2 weeks ago

Hi @yiftahw, before you get too far into this approach, what I believe we would like to see for #7029 would be a modification to the compileCommands property that accepts an array of strings (paths to the individual files to merge) instead of performing an actual merge and saving the results into another file.

The starting point is more like this (this is an incomplete code sample): c_cpp_properties.schema.json

                    "compileCommands": {
                        "oneOf": [
                            {
                                "type": "string"
                            },
                            {
                                "type": "array",
                                "items": {
                                    "type": "string"
                                }
                            }
                        ],
                        "markdownDescription": "Full path to `compile_commands.json` file for the workspace.",
                        "descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
                    },

package.json

                    "C_Cpp.default.compileCommands": {
                        "oneOf": [
                            {
                                "type": "string"
                            },
                            {
                                "type": "array",
                                "items": {
                                    "type": "string"
                                }
                            }
                        ],
                        "markdownDescription": "%c_cpp.configuration.default.compileCommands.markdownDescription%",
                        "scope": "machine-overridable"
                    },

Then in code, the compileCommands property/setting is treated as string | string[]. To avoid having to create an additional temporary file, we would prefer to pass this new setting down to our language server as a string[] and then in the language server we would parse through each of the files individually and add them all into a single object containing all entries.

Unfortunately, that part of the change requires access to the closed-source portion of the code which you don't have access to.

yiftahw commented 2 weeks ago

Unfortunately, that part of the change requires access to the closed-source portion of the code which you don't have access to.

Hi @bobbrow thanks for the quick reply! Is there a plan to add this feature to the closed-source part of the code? I'm more than willing to work on the open-source part.

bobbrow commented 2 weeks ago

Sorting by upvotes, this feature is on the first page of language server feature requests, though it's not terribly close to the top. However, since a lot of the higher voted features are not currently actionable and this one shouldn't be too costly to implement, we may be able to find some time to prioritize it sooner. I can't provide an estimate of when we'd get to it, but if you did the open source part, that could help accelerate us completing the closed source part.

Things we'd like to see on the open source part:

There could be other things I'm not thinking of right now, but we'd figure those out during PR, or perhaps you will run into them during development if you choose to help with this.

Thank you! Bob

yiftahw commented 2 weeks ago

@bobbrow I'll start fiddling with your approach and create a new draft once some work is done... Thanks for the tips!

sean-mcmanus commented 2 weeks ago

@bobbrow Yeah, the work to enable compileCommands to be an array of strings seems pretty small on the cpptools side.

yiftahw commented 2 weeks ago

@bobbrow @sean-mcmanus on a different note, may I ask why do we monitor and send a ChangeCompileCommandsNotification to the language server on compile_commands.json files other than the one from the selected configuration? (in updateCompileCommandsFileWatchers())
I'm asking because monitoring groups of files (if multiple configurations exist) seems less trivial than a single file per configuration (although not impossible)
also, the fallback implementation in checkCompileCommands() only monitors the selected configuration file (or the default one)
code snippet in question: 

// partial snippet from `src/LanguageServer/configurations.ts`
// `CppProperties::updateCompileCommandsFileWatchers()`
this.configurationJson.configurations.forEach(c => {
    filePaths.add(fileSystemCompileCommandsPath);
});
filePaths.forEach((path: string) => {
    this.compileCommandsFileWatchers.push(fs.watch(path, () => {
        this.compileCommandsFileWatcherTimer = setTimeout(() => {
            this.compileCommandsFileWatcherFiles.forEach((path: string) => {
                this.onCompileCommandsChanged(path); // <- notify language server
sean-mcmanus commented 2 weeks ago

@yiftahw I think that is a bug related to https://github.com/Microsoft/vscode-cpptools/issues/12889 .

yiftahw commented 2 weeks ago

@sean-mcmanus just to make sure, I'm asking wether the language server benfits from knowing in advance that a compile_commands.json file has changed, even if it belongs to a configuration that we don't currently use.

again, the fallback case in checkCompileCommands() only checks the file pointed by the current configuration. (which is not so much a fallback because it's always being checked, even if file watchers don't fail)

monitoring all the files by the file watchers but only the currently used one in the fallback case causes a weird side effect: if a compile_commands.json file form a different configuration index is changed, it triggers a file watcher event immidiately. when we switch to the configuration that uses that file, it also creates a 2nd event by the fallback logic in checkCompileCommands(). (the cached path in compileCommandsFile only changes when we change configuration)

if you think there is no benefit on notifying the language server on changes to compile_commands.json that we don't currently use (i.e from a different configuration index), I will file an issue and work on to fix it.
I think I can benefit from this change going forward with what was discussed here previously with @bobbrow

sean-mcmanus commented 2 weeks ago

@yiftahw No, cpptools does not need to know that a compile_commands.json has changed if it's not set in the current configuration -- it just results in unnecessary processing. However, if a configurationProvider is set, then compileCommands may still be used as a fallback (but it doesn't need to be updated if compileCommands is not set).

yiftahw commented 2 weeks ago

@yiftahw No, cpptools does not need to know that a compile_commands.json has changed if it's not set in the current configuration -- it just results in unnecessary processing. However, if a configurationProvider is set, then compileCommands may still be used as a fallback (but it doesn't need to be updated if compileCommands is not set).

Is there a way in the open source part of the extension to know if there is some issue with the configuration provider and we need to fall back to using compile commands? (if set)

sean-mcmanus commented 2 weeks ago

Is there a way in the open source part of the extension to know if there is some issue with the configuration provider and we need to fall back to using compile commands? (if set)

You might be able to call canProvideConfiguration. The communicate with the configuration provider is all done in the open source TypeScript.

Actually, upon further review it appears my answer to your previous question was incorrect -- the current implementation does appear to rely on switching a configuration having already received a didChangeCompileCommands message, and otherwise it looks like it would continue to use the old compile commands, but that seems like the wrong implementation to me. Maybe it could be changed such that when a user switches configurations, then it can send the didChangeCompileCommands then (ideally beforehand).

yiftahw commented 2 days ago

closing in favor of #12960