Skip to content

Commit 981e887

Browse files
authored
Merge branch 'main' into coleng/recursive_includes_settings
2 parents d6b7eef + 4412f20 commit 981e887

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

Extension/package.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,6 +1880,7 @@
18801880
"bugprone-assert-side-effect",
18811881
"bugprone-assignment-in-if-condition",
18821882
"bugprone-bad-signal-to-kill-thread",
1883+
"bugprone-bitwise-pointer-cast",
18831884
"bugprone-bool-pointer-implicit-conversion",
18841885
"bugprone-branch-clone",
18851886
"bugprone-casting-through-void",
@@ -1900,6 +1901,7 @@
19001901
"bugprone-inc-dec-in-conditions",
19011902
"bugprone-incorrect-*",
19021903
"bugprone-incorrect-enable-if",
1904+
"bugprone-incorrect-enable-shared-from-this",
19031905
"bugprone-incorrect-roundings",
19041906
"bugprone-infinite-loop",
19051907
"bugprone-integer-division",
@@ -1918,6 +1920,7 @@
19181920
"bugprone-narrowing-conversions",
19191921
"bugprone-no-escape",
19201922
"bugprone-non-zero-enum-to-bool-conversion",
1923+
"bugprone-nondeterministic-pointer-iteration-order",
19211924
"bugprone-not-null-terminated-result",
19221925
"bugprone-optional-value-conversion",
19231926
"bugprone-parent-virtual-call",
@@ -1951,6 +1954,7 @@
19511954
"bugprone-suspicious-stringview-data-usage",
19521955
"bugprone-swapped-arguments",
19531956
"bugprone-switch-missing-default-case",
1957+
"bugprone-tagged-union-member-count",
19541958
"bugprone-terminating-continue",
19551959
"bugprone-throw-keyword-missing",
19561960
"bugprone-too-small-loop-variable",
@@ -2342,6 +2346,7 @@
23422346
"modernize-use-equals-*",
23432347
"modernize-use-equals-default",
23442348
"modernize-use-equals-delete",
2349+
"modernize-use-integer-sign-comparison",
23452350
"modernize-use-nodiscard",
23462351
"modernize-use-noexcept",
23472352
"modernize-use-nullptr",
@@ -2401,6 +2406,7 @@
24012406
"portability-restrict-system-includes",
24022407
"portability-simd-intrinsics",
24032408
"portability-std-allocator-const",
2409+
"portability-template-virtual-member-function",
24042410
"readability-*",
24052411
"readability-avoid-*",
24062412
"readability-avoid-const-params-in-decls",
@@ -2534,6 +2540,7 @@
25342540
"bugprone-assert-side-effect",
25352541
"bugprone-assignment-in-if-condition",
25362542
"bugprone-bad-signal-to-kill-thread",
2543+
"bugprone-bitwise-pointer-cast",
25372544
"bugprone-bool-pointer-implicit-conversion",
25382545
"bugprone-branch-clone",
25392546
"bugprone-casting-through-void",
@@ -2554,6 +2561,7 @@
25542561
"bugprone-inc-dec-in-conditions",
25552562
"bugprone-incorrect-*",
25562563
"bugprone-incorrect-enable-if",
2564+
"bugprone-incorrect-enable-shared-from-this",
25572565
"bugprone-incorrect-roundings",
25582566
"bugprone-infinite-loop",
25592567
"bugprone-integer-division",
@@ -2572,6 +2580,7 @@
25722580
"bugprone-narrowing-conversions",
25732581
"bugprone-no-escape",
25742582
"bugprone-non-zero-enum-to-bool-conversion",
2583+
"bugprone-nondeterministic-pointer-iteration-order",
25752584
"bugprone-not-null-terminated-result",
25762585
"bugprone-optional-value-conversion",
25772586
"bugprone-parent-virtual-call",
@@ -2605,6 +2614,7 @@
26052614
"bugprone-suspicious-stringview-data-usage",
26062615
"bugprone-swapped-arguments",
26072616
"bugprone-switch-missing-default-case",
2617+
"bugprone-tagged-union-member-count",
26082618
"bugprone-terminating-continue",
26092619
"bugprone-throw-keyword-missing",
26102620
"bugprone-too-small-loop-variable",
@@ -2996,6 +3006,7 @@
29963006
"modernize-use-equals-*",
29973007
"modernize-use-equals-default",
29983008
"modernize-use-equals-delete",
3009+
"modernize-use-integer-sign-comparison",
29993010
"modernize-use-nodiscard",
30003011
"modernize-use-noexcept",
30013012
"modernize-use-nullptr",
@@ -3055,6 +3066,7 @@
30553066
"portability-restrict-system-includes",
30563067
"portability-simd-intrinsics",
30573068
"portability-std-allocator-const",
3069+
"portability-template-virtual-member-function",
30583070
"readability-*",
30593071
"readability-avoid-*",
30603072
"readability-avoid-const-params-in-decls",

Extension/src/LanguageServer/codeAnalysis.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ export function publishCodeAnalysisDiagnostics(params: PublishCodeAnalysisDiagno
379379
docPage = `checks${checksGroup}/${checksPage}.html`;
380380
}
381381
// TODO: This should be checking the clang-tidy version used to better support usage of older versions.
382-
const primaryDocUri: vscode.Uri = vscode.Uri.parse(`https://releases.llvm.org/19.1.0/tools/clang/tools/extra/docs/clang-tidy/${docPage}`);
382+
const primaryDocUri: vscode.Uri = vscode.Uri.parse(`https://releases.llvm.org/20.1.0/tools/clang/tools/extra/docs/clang-tidy/${docPage}`);
383383
diagnostic.code = { value: identifier.code, target: primaryDocUri };
384384

385385
if (new CppSettings().clangTidyCodeActionShowDocumentation) {

0 commit comments

Comments
 (0)