Adding Paths to Workbench(VSCode) intellisense

Developer Tools Particle Workbench
1

Hi,

I've added a custom build.mk which now includes some directories for tidying my code up. The build.mk works fine but I can't seem to get VSCode to intellisense correctly. With the following build.mk what do I need to add to VSCode to get intellisense working.

INCLUDE_DIRS += $(SOURCE_PATH)inc
INCLUDE_DIRS += $(wildcard $(SOURCE_PATH)/lib/common/*/src)
INCLUDE_DIRS += $(wildcard $(SOURCE_PATH)lib/modules/*/src)

## Standard behavior must be included here
INCLUDE_DIRS += $(SOURCE_PATH)$(USRSRC)  # add user sources to include path
CPPSRC += $(call target_files,$(USRSRC_SLASH),*.cpp)
CSRC += $(call target_files,$(USRSRC_SLASH),*.c)

APPSOURCES=$(call target_files,$(USRSRC_SLASH),*.cpp)
APPSOURCES+=$(call target_files,$(USRSRC_SLASH),*.c)

I've tried adding the following to settings.json but it doesn't seem to be picked up, I suspect that the particle-vscode-core provider is overriding my settings.

{
    "extensions.ignoreRecommendations": true,
    "C_Cpp.default.configurationProvider": "particle.particle-vscode-core",
    "files.associations": {
        "*.ino": "cpp"
    },
    "configurations": [
        {
            "name": "inc",
            "includePath": [
                "${workspaceFolder}/inc/**",
                "${workspaceFolder}/lib/common/**",
                "${workspaceFolder}/inc/modules/**",
                "${default}"
            ]
        }
    ],   
    "C_Cpp.default.browse.path": ["${workspaceFolder}/inc"],
    "C_Cpp.default.includePath": ["${workspaceFolder}/inc"],
    "C_Cpp.default.systemIncludePath": ["${workspaceFolder}/inc"],
    "particle.firmwareVersion": "6.2.1",
    "particle.targetPlatform": "b5som",
    "particle.enableVerboseLocalCompilerLogging": true
}
2

What is the specific include file path that's not being picked up by Intellisense that should be?

3

The first three lines as detailed in the first message in the build.mk in this post.

Currently the only way I can get intellisense looking in the directories specified in the build.mk is to add it as a c_cpp_properties.json file and disable the particle configurationProvider and use the default provider. Needless to say this is a bit cumbersome as I now have to rebuild what the particle provider puts into the include list including all the Defines, which could and I suspect would change on every release.