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.

Sign up for GitHub

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

Jump to bottom

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
+149 −55
Open

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

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f346723
accept an array in compile commands schema
Nov 10, 2024
2dc0fa3
handle settings.json of multiple compile commands
yiftahw Nov 10, 2024
02a2812
update schemas
yiftahw Nov 10, 2024
280aee1
an array is returned from default settings only if non-empty with non…
yiftahw Nov 10, 2024
b934a92
basic handling of compile commands array in configurations
yiftahw Nov 11, 2024
e273731
Merge branch 'main' into handle-multiple-compile-commands
Nov 13, 2024
0c8ccb1
fixes after merge
Nov 13, 2024
8e84183
yarn lint
yiftahw Nov 14, 2024
22de1e0
unify check behavior
yiftahw Nov 14, 2024
62a8915
update desription in schema
yiftahw Nov 14, 2024
d7e2a4a
handle parsed values from c_cpp_properties.json
yiftahw Nov 14, 2024
b1614de
reverse logic to default as undefined
yiftahw Nov 14, 2024
7fe9904
squiggles for multi paths
yiftahw Nov 14, 2024
82c4e53
remove not needed optional guard
yiftahw Nov 14, 2024
69c4013
squiggles finalized
yiftahw Nov 14, 2024
d2bf51d
paths should be separated telemetry enabled for a single string
yiftahw Nov 14, 2024
6aa66f6
yarn lint
yiftahw Nov 14, 2024
45bb041
update UI to handle multiple compile commands files
yiftahw Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions Extension/c_cpp_properties.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,22 @@
]
},
"compileCommands": {
"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.",
"type": "string"
"oneOf": [
{
"type": "string",
"default": ""
bobbrow marked this conversation as resolved.
Show resolved Hide resolved
},
{
"type": "array",
"items": {
"type": "string"
},
"uniqueItems": true,
"default": []
}
],
"markdownDescription": "Full path or a list of full paths to `compile_commands.json` files 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."
},
"includePath": {
"markdownDescription": "A list of paths for the IntelliSense engine to use while searching for included headers. Searching on these paths is not recursive. Specify `**` to indicate recursive search. For example, `${workspaceFolder}/**` will search through all subdirectories while `${workspaceFolder}` will not. Usually, this should not include system includes; instead, set `C_Cpp.default.compilerPath`.",
Expand Down
15 changes: 14 additions & 1 deletion Extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,20 @@
"scope": "machine-overridable"
},
"C_Cpp.default.compileCommands": {
"type": "string",
"oneOf": [
{
"type": "string",
"default": ""
},
{
"type": "array",
"items": {
"type": "string"
},
"uniqueItems": true,
"default": []
}
],
"markdownDescription": "%c_cpp.configuration.default.compileCommands.markdownDescription%",
"scope": "machine-overridable"
},
Expand Down
Loading