mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 16:47:28 +01:00
Have dumbindent catch "namespace foo {".
This commit is contained in:
1 parent
3b1d3d0a39
commit
63c12cad17
2 files changed
+19
-5
No files matched your search
@@ -118,7 +118,8 @@ import (
|
|||||||
// 'Constants', but their type is []byte, not string.
|
// 'Constants', but their type is []byte, not string.
|
||||||
var (
|
var (
|
||||||
backTick = []byte("`")
|
backTick = []byte("`")
|
||||||
externC = []byte("extern \"C\"")
|
externC = []byte("extern \"C\" {")
|
||||||
|
namespace = []byte("namespace ")
|
||||||
starSlash = []byte("*/")
|
starSlash = []byte("*/")
|
||||||
|
|
||||||
spaces = []byte(" ")
|
spaces = []byte(" ")
|
||||||
@@ -204,12 +205,10 @@ outer:
|
|||||||
|
|
||||||
// Preprocessor lines (#ifdef, #pragma, etc) are never indented.
|
// Preprocessor lines (#ifdef, #pragma, etc) are never indented.
|
||||||
//
|
//
|
||||||
// The '{' and '}' for an `extern "C"` are also special cased not to
|
// Also catch `extern "C" {` and `namespace foo {`.
|
||||||
// change indentation inside the block. This assumes that the closing
|
|
||||||
// brace is followed by a `// extern "C"` comment.
|
|
||||||
if (line[0] == '#') ||
|
if (line[0] == '#') ||
|
||||||
((line[0] == 'e') && bytes.HasPrefix(line, externC)) ||
|
((line[0] == 'e') && bytes.HasPrefix(line, externC)) ||
|
||||||
((line[0] == '}') && bytes.HasSuffix(line, externC)) {
|
((line[0] == 'n') && bytes.HasPrefix(line, namespace)) {
|
||||||
line = trimTrailingWhiteSpace(line)
|
line = trimTrailingWhiteSpace(line)
|
||||||
dst = append(dst, line...)
|
dst = append(dst, line...)
|
||||||
dst = append(dst, '\n')
|
dst = append(dst, '\n')
|
||||||
@@ -224,6 +223,17 @@ outer:
|
|||||||
}
|
}
|
||||||
nBraces -= closeBraces
|
nBraces -= closeBraces
|
||||||
|
|
||||||
|
// The heuristics aren't perfect, and sometimes do not catch braces or
|
||||||
|
// parentheses in #define macros. They also don't increment nBraces for
|
||||||
|
// `extern "C"` or namespace lines. We work around that here, clamping
|
||||||
|
// to zero.
|
||||||
|
if nBraces < 0 {
|
||||||
|
nBraces = 0
|
||||||
|
}
|
||||||
|
if nParens < 0 {
|
||||||
|
nParens = 0
|
||||||
|
}
|
||||||
|
|
||||||
// Output a certain number of spaces to rougly approximate the
|
// Output a certain number of spaces to rougly approximate the
|
||||||
// "clang-format -style=Chromium" indentation style.
|
// "clang-format -style=Chromium" indentation style.
|
||||||
indent := 0
|
indent := 0
|
||||||
|
|||||||
@@ -75,6 +75,10 @@ func TestFormatBytes(tt *testing.T) {
|
|||||||
// Leading blank lines.
|
// Leading blank lines.
|
||||||
src: "\n\n\n x = y;",
|
src: "\n\n\n x = y;",
|
||||||
want: "x = y;\n",
|
want: "x = y;\n",
|
||||||
|
}, {
|
||||||
|
// Namespaces.
|
||||||
|
src: "namespace A {\nint f() {\nreturn 0;\n}\n}\n",
|
||||||
|
want: "namespace A {\nint f() {\n return 0;\n}\n}\n",
|
||||||
}}
|
}}
|
||||||
|
|
||||||
for i, tc := range testCases {
|
for i, tc := range testCases {
|
||||||
|
|||||||
Reference in new issue
Block a user