Skip to content

Commit 6648c40

Browse files
authored
Add preferredPathSeparator setting and update package.json version and fwlinks (#1854)
* Add preferredPathSeparator setting * Update package.json version and fwlinks.
1 parent 8f21515 commit 6648c40

File tree

4 files changed

+26
-14
lines changed

4 files changed

+26
-14
lines changed

Extension/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Extension/package.json

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "cpptools",
33
"displayName": "C/C++",
44
"description": "C/C++ IntelliSense, debugging, and code browsing.",
5-
"version": "0.16.1",
5+
"version": "0.17.0-master",
66
"publisher": "ms-vscode",
77
"preview": true,
88
"icon": "LanguageCCPP_color_128x.png",
@@ -201,6 +201,16 @@
201201
"description": "Instructs the extension when to use the \"files.exclude\" setting when determining which files should be added to the code navigation database while traversing through the paths in the \"browse.path\" array. \"checkFolders\" means that the exclusion filters will only be evaluated once per folder (individual files are not checked). \"checkFilesAndFolders\" means that the exclusion filters will be evaluated against every file and folder encountered. If your \"files.exclude\" setting only contains folders, then \"checkFolders\" is the best choice and will increase the speed at which the extension can initialize the code navigation database.",
202202
"scope": "resource"
203203
},
204+
"C_Cpp.preferredPathSeparator": {
205+
"type": "string",
206+
"enum": [
207+
"Forward Slash",
208+
"Back Slash"
209+
],
210+
"default": "Forward Slash",
211+
"description": "The character used as a path separator for #include auto-completion results.",
212+
"scope": "resource"
213+
},
204214
"C_Cpp.commentContinuationPatterns": {
205215
"type": "array",
206216
"default": [
@@ -1294,7 +1304,7 @@
12941304
"runtimeDependencies": [
12951305
{
12961306
"description": "C/C++ language components (Linux / x86_64)",
1297-
"url": "https://go.microsoft.com/fwlink/?linkid=871264",
1307+
"url": "https://go.microsoft.com/fwlink/?linkid=872599",
12981308
"platforms": [
12991309
"linux"
13001310
],
@@ -1308,7 +1318,7 @@
13081318
},
13091319
{
13101320
"description": "C/C++ language components (Linux / x86)",
1311-
"url": "https://go.microsoft.com/fwlink/?linkid=871265",
1321+
"url": "https://go.microsoft.com/fwlink/?linkid=872600",
13121322
"platforms": [
13131323
"linux"
13141324
],
@@ -1324,7 +1334,7 @@
13241334
},
13251335
{
13261336
"description": "C/C++ language components (OS X)",
1327-
"url": "https://go.microsoft.com/fwlink/?linkid=871266",
1337+
"url": "https://go.microsoft.com/fwlink/?linkid=872601",
13281338
"platforms": [
13291339
"darwin"
13301340
],
@@ -1335,15 +1345,15 @@
13351345
},
13361346
{
13371347
"description": "C/C++ language components (Windows)",
1338-
"url": "https://go.microsoft.com/fwlink/?linkid=871267",
1348+
"url": "https://go.microsoft.com/fwlink/?linkid=872602",
13391349
"platforms": [
13401350
"win32"
13411351
],
13421352
"binaries": []
13431353
},
13441354
{
13451355
"description": "ClangFormat (Linux / x86_64)",
1346-
"url": "https://go.microsoft.com/fwlink/?LinkID=848955",
1356+
"url": "https://go.microsoft.com/fwlink/?LinkID=872607",
13471357
"platforms": [
13481358
"linux"
13491359
],
@@ -1356,7 +1366,7 @@
13561366
},
13571367
{
13581368
"description": "ClangFormat (Linux / x86)",
1359-
"url": "https://go.microsoft.com/fwlink/?LinkID=864640",
1369+
"url": "https://go.microsoft.com/fwlink/?LinkID=872608",
13601370
"platforms": [
13611371
"linux"
13621372
],
@@ -1371,7 +1381,7 @@
13711381
},
13721382
{
13731383
"description": "ClangFormat (OS X)",
1374-
"url": "https://go.microsoft.com/fwlink/?LinkID=848956",
1384+
"url": "https://go.microsoft.com/fwlink/?LinkID=872609",
13751385
"platforms": [
13761386
"darwin"
13771387
],
@@ -1381,7 +1391,7 @@
13811391
},
13821392
{
13831393
"description": "ClangFormat (Windows)",
1384-
"url": "https://go.microsoft.com/fwlink/?LinkID=848957",
1394+
"url": "https://go.microsoft.com/fwlink/?LinkID=872610",
13851395
"platforms": [
13861396
"win32"
13871397
],

Extension/src/LanguageServer/client.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,8 @@ class DefaultClient implements Client {
401401
dimInactiveRegions: settings.dimInactiveRegions,
402402
loggingLevel: settings.loggingLevel,
403403
workspaceParsingPriority: settings.workspaceParsingPriority,
404-
exclusionPolicy: settings.exclusionPolicy
404+
exclusionPolicy: settings.exclusionPolicy,
405+
preferredPathSeparator: settings.preferredPathSeparator
405406
},
406407
middleware: createProtocolFilter(this, allClients), // Only send messages directed at this client.
407408
errorHandler: {

Extension/src/LanguageServer/settings.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export class CppSettings extends Settings {
4747
public get workspaceParsingPriority(): boolean { return super.Section.get<boolean>("workspaceParsingPriority"); }
4848
public get exclusionPolicy(): boolean { return super.Section.get<boolean>("exclusionPolicy"); }
4949
public get commentContinuationPatterns(): (string | CommentPattern)[] { return super.Section.get<(string | CommentPattern)[]>("commentContinuationPatterns"); }
50+
public get preferredPathSeparator(): string { return super.Section.get<string>("preferredPathSeparator"); }
5051
public get defaultIncludePath(): string[] { return super.Section.get<string[]>("default.includePath"); }
5152
public get defaultDefines(): string[] { return super.Section.get<string[]>("default.defines"); }
5253
public get defaultMacFrameworkPath(): string[] { return super.Section.get<string[]>("default.macFrameworkPath"); }

0 commit comments

Comments
 (0)