Fix clang_format -> clang-format.
Bug: 1447924 Change-Id: If8534649c05d95b87c10afac383f45633699db2e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4567226 Commit-Queue: Joanna Wang <jojwang@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org> Reviewed-by: Nico Weber <thakis@chromium.org> Auto-Submit: Joanna Wang <jojwang@chromium.org> Cr-Commit-Position: refs/heads/main@{#1149721}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
8839a2194f
commit
3aafdb20f6
2
DEPS
2
DEPS
@ -534,7 +534,7 @@ deps = {
|
||||
Var('chromium_git') +
|
||||
'/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@' +
|
||||
Var('clang_format_revision'),
|
||||
'src/third_party/clang_format/script':
|
||||
'src/third_party/clang-format/script':
|
||||
Var('chromium_git') +
|
||||
'/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@' +
|
||||
Var('clang_format_revision'),
|
||||
|
@ -27,7 +27,7 @@ the now-formatted code.
|
||||
Many developers find it useful to integrate the clang-format tool with their
|
||||
editor of choice. As a convenience, the scripts for this are also available in
|
||||
your checkout of Chrome under
|
||||
[src/third_party/clang_format/script/](https://source.chromium.org/chromium/chromium/src/+/HEAD:third_party/clang_format/script/).
|
||||
[src/third_party/clang-format/script/](https://source.chromium.org/chromium/chromium/src/+/HEAD:third_party/clang_format/script/).
|
||||
|
||||
If you use an editor integration, you should try to make sure that you're using
|
||||
the version of clang-format that comes with your checkout. That way, you'll
|
||||
|
@ -160,7 +160,7 @@ We have an emacs module,
|
||||
which adds c-mode formatting. Then add to your .emacs:
|
||||
|
||||
```el
|
||||
(load "/<path/to/chromium>/src/third_party/clang_format/script/clang-format.el")
|
||||
(load "/<path/to/chromium>/src/third_party/clang-format/script/clang-format.el")
|
||||
(add-hook 'c-mode-common-hook
|
||||
(function (lambda () (local-set-key (kbd "TAB") 'clang-format-region))))
|
||||
```
|
||||
|
@ -234,7 +234,7 @@ and hence is not useful on third_party projects that use another style.
|
||||
|
||||
```shell
|
||||
cd /path/to/chromium/src
|
||||
cp third_party/clang_format/script/clang-format-sublime.py ~/.config/sublime-text-3/Packages/User/
|
||||
cp third_party/clang-format/script/clang-format-sublime.py ~/.config/sublime-text-3/Packages/User/
|
||||
```
|
||||
|
||||
1. This installs a plugin that defines the command "clang\_format". You can add
|
||||
|
2
third_party/.gitignore
vendored
2
third_party/.gitignore
vendored
@ -74,7 +74,7 @@
|
||||
/chromevox/third_party/sre/src
|
||||
/chromite
|
||||
/crossbench
|
||||
/clang_format/script
|
||||
/clang-format/script
|
||||
/cld_2/src
|
||||
/cld_3/src
|
||||
/colorama/src
|
||||
|
@ -215,7 +215,7 @@ PATH_SPECIFIC_ALLOWLISTED_LICENSES = {
|
||||
'UNKNOWN',
|
||||
],
|
||||
# http://crbug.com/333508
|
||||
'third_party/clang_format/script': [
|
||||
'third_party/clang-format/script': [
|
||||
'UNKNOWN',
|
||||
],
|
||||
'third_party/devscripts': [
|
||||
@ -479,7 +479,6 @@ PATH_SPECIFIC_ALLOWLISTED_LICENSES = {
|
||||
'third_party/sqlite': [
|
||||
'UNKNOWN',
|
||||
],
|
||||
|
||||
'third_party/minizip': [
|
||||
'UNKNOWN',
|
||||
],
|
||||
|
@ -123,7 +123,7 @@ constexpr const char* const kRawPtrManualPathsToIgnore[] = {
|
||||
// sort | uniq > ~/scratch/git-paths
|
||||
// TODO(crbug.com/1447924): remove buildtools path
|
||||
"buildtools/clang_format/script/",
|
||||
"third_party/clang_format/script/",
|
||||
"third_party/clang-format/script/",
|
||||
"chrome/app/theme/default_100_percent/google_chrome/",
|
||||
"chrome/app/theme/default_200_percent/google_chrome/",
|
||||
"chrome/app/theme/google_chrome/",
|
||||
|
@ -7,7 +7,7 @@
|
||||
" current line.)
|
||||
|
||||
let s:script = expand('<sfile>:p:h') .
|
||||
\'/../../third_party/clang_format/script/clang-format.py'
|
||||
\'/../../third_party/clang-format/script/clang-format.py'
|
||||
let s:shortcut = has('mac') ? "<D-I>" : "<C-I>"
|
||||
let s:pyf = has("python3") ? ":py3f" : ":pyf"
|
||||
|
||||
|
Reference in New Issue
Block a user