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

Allow merge of C_Cpp_Properties & configuration provider. #8174

Merged
merged 11 commits into from
Oct 5, 2021
Merged

Allow merge of C_Cpp_Properties & configuration provider. #8174

merged 11 commits into from
Oct 5, 2021

Commits on Sep 19, 2021

  1. Allow merge of C_Cpp_Properties & configuration provider. 

    Adds a configuration that enables the include paths, defines, and forced
includes from `c_cpp_properties.json` to be merged with those provided
by a configuration provider.

This is especially helpful for projects that use unsupported compilers
as defines/includePaths/forcedIncludes can be provided as shims for
intellisense.
    @willson556
    willson556 committed Sep 19, 2021
    Configuration menu
    Copy the full SHA
    c6f97a0 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2021

  1. Add mergeConfigurations property to settings UI.

    @willson556
    willson556 committed Sep 21, 2021
    Configuration menu
    Copy the full SHA
    8afc19c View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2021

  1. mergeConfigurations description improvements.

    @willson556
    willson556 committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    eddd7bd View commit details
    Browse the repository at this point in the history

  2. Add C_Cpp_Properties.default.mergeConfigurations

    @willson556
    willson556 committed Sep 23, 2021
    Configuration menu
    Copy the full SHA
    5ec5dbb View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. Address @michelleangela's feedback.

    @willson556
    willson556 committed Sep 24, 2021
    Configuration menu
    Copy the full SHA
    a26e5b6 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2021

  1. Merge branch 'main' into feature/MergeC_CppPropertiesWithConfiguratio… 

    …nProvider
    @sean-mcmanus
    sean-mcmanus committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    ca6e6b8 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Address @sean-mcmanus' feedback.

    @willson556
    willson556 committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    795ef47 View commit details
    Browse the repository at this point in the history

  2. Workaround linter bug.

    @willson556
    willson556 committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    621ca46 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2021

  1. Merge branch 'main' into feature/MergeC_CppPropertiesWithConfiguratio… 

    …nProvider
    @willson556
    willson556 committed Sep 30, 2021
    Configuration menu
    Copy the full SHA
    c94f0b8 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2021

  1. Fix for loops in a way that also satisfies the linter.

    @willson556
    willson556 committed Oct 2, 2021
    Configuration menu
    Copy the full SHA
    babd61c View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. Merge branch 'main' into feature/MergeC_CppPropertiesWithConfiguratio… 

    …nProvider
    @sean-mcmanus
    sean-mcmanus committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    67b3982 View commit details
    Browse the repository at this point in the history