mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-29 19:15:00 +01:00
DavidLoftusandDavid Blaikie
301172f589
Makes following changes to Carbon::Format() - TokenKind::Period (i.e. `.`) should never have a space before or after it. - TokenKind::CloseSquareParen (i.e. `]`) should be treated as packed content (no space preceeding it) - Only exception I can think of is `impl forall [...]` - Remove preceeding space from `[` and `(` if previous token was an identifier (or identifier-ish token) - Remove seperator following `++` / `--` unary operators. - Explicit gaps in source code should be retained, up to 2 new lines. Multiple test files were added to test formatting. I imagine eventually this will need to be updated to read parse tree to gather more context but this atleast lets us get a decent-ish format for many of our current sample files (e.g. sieve.carbon) Assisted-With: Gemini / Antigravity --------- Co-authored-by: David Blaikie <dblaikie@gmail.com>
124 lines
4.4 KiB
Plaintext
124 lines
4.4 KiB
Plaintext
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/language_server/testdata/formatting/basic.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/language_server/testdata/formatting/basic.carbon
|
|
|
|
// --- STDIN
|
|
[[@LSP-CALL:initialize:"capabilities": {}]]
|
|
[[@LSP-NOTIFY:textDocument/didOpen:
|
|
"textDocument": {"uri": "file:/unformatted.carbon", "languageId": "carbon",
|
|
"text": "fn F( ) { return ; }"}
|
|
]]
|
|
[[@LSP-CALL:textDocument/formatting:
|
|
"textDocument": {"uri": "file:/unformatted.carbon"},
|
|
"options": {"tabSize": 2, "insertSpaces": true}
|
|
]]
|
|
[[@LSP-NOTIFY:textDocument/didOpen:
|
|
"textDocument": {"uri": "file:/formatted.carbon", "languageId": "carbon",
|
|
"text": "fn F() {\n return;\n}\n"}
|
|
]]
|
|
[[@LSP-CALL:textDocument/formatting:
|
|
"textDocument": {"uri": "file:/formatted.carbon"},
|
|
"options": {"tabSize": 2, "insertSpaces": true}
|
|
]]
|
|
[[@LSP-NOTIFY:textDocument/didOpen:
|
|
"textDocument": {"uri": "file:/empty.carbon", "languageId": "carbon",
|
|
"text": ""}
|
|
]]
|
|
[[@LSP-CALL:textDocument/formatting:
|
|
"textDocument": {"uri": "file:/empty.carbon"},
|
|
"options": {"tabSize": 2, "insertSpaces": true}
|
|
]]
|
|
[[@LSP-CALL:shutdown]]
|
|
[[@LSP-NOTIFY:exit]]
|
|
|
|
// CHECK:STDOUT: Content-Length: 394{{\r}}
|
|
// CHECK:STDOUT: {{\r}}
|
|
// CHECK:STDOUT: {
|
|
// CHECK:STDOUT: "id": 1,
|
|
// CHECK:STDOUT: "jsonrpc": "2.0",
|
|
// CHECK:STDOUT: "result": {
|
|
// CHECK:STDOUT: "capabilities": {
|
|
// CHECK:STDOUT: "declarationProvider": true,
|
|
// CHECK:STDOUT: "definitionProvider": true,
|
|
// CHECK:STDOUT: "documentFormattingProvider": true,
|
|
// CHECK:STDOUT: "documentSymbolProvider": true,
|
|
// CHECK:STDOUT: "hoverProvider": true,
|
|
// CHECK:STDOUT: "positionEncoding": "utf-16",
|
|
// CHECK:STDOUT: "referencesProvider": true,
|
|
// CHECK:STDOUT: "textDocumentSync": 2,
|
|
// CHECK:STDOUT: "typeDefinitionProvider": true
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }Content-Length: 151{{\r}}
|
|
// CHECK:STDOUT: {{\r}}
|
|
// CHECK:STDOUT: {
|
|
// CHECK:STDOUT: "jsonrpc": "2.0",
|
|
// CHECK:STDOUT: "method": "textDocument/publishDiagnostics",
|
|
// CHECK:STDOUT: "params": {
|
|
// CHECK:STDOUT: "diagnostics": [],
|
|
// CHECK:STDOUT: "uri": "file:///unformatted.carbon"
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }Content-Length: 283{{\r}}
|
|
// CHECK:STDOUT: {{\r}}
|
|
// CHECK:STDOUT: {
|
|
// CHECK:STDOUT: "id": 2,
|
|
// CHECK:STDOUT: "jsonrpc": "2.0",
|
|
// CHECK:STDOUT: "result": [
|
|
// CHECK:STDOUT: {
|
|
// CHECK:STDOUT: "newText": "fn F() {\n return;\n}\n",
|
|
// CHECK:STDOUT: "range": {
|
|
// CHECK:STDOUT: "end": {
|
|
// CHECK:STDOUT: "character": 0,
|
|
// CHECK:STDOUT: "line": 1
|
|
// CHECK:STDOUT: },
|
|
// CHECK:STDOUT: "start": {
|
|
// CHECK:STDOUT: "character": 0,
|
|
// CHECK:STDOUT: "line": 0
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: ]
|
|
// CHECK:STDOUT: }Content-Length: 149{{\r}}
|
|
// CHECK:STDOUT: {{\r}}
|
|
// CHECK:STDOUT: {
|
|
// CHECK:STDOUT: "jsonrpc": "2.0",
|
|
// CHECK:STDOUT: "method": "textDocument/publishDiagnostics",
|
|
// CHECK:STDOUT: "params": {
|
|
// CHECK:STDOUT: "diagnostics": [],
|
|
// CHECK:STDOUT: "uri": "file:///formatted.carbon"
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }Content-Length: 49{{\r}}
|
|
// CHECK:STDOUT: {{\r}}
|
|
// CHECK:STDOUT: {
|
|
// CHECK:STDOUT: "id": 3,
|
|
// CHECK:STDOUT: "jsonrpc": "2.0",
|
|
// CHECK:STDOUT: "result": []
|
|
// CHECK:STDOUT: }Content-Length: 145{{\r}}
|
|
// CHECK:STDOUT: {{\r}}
|
|
// CHECK:STDOUT: {
|
|
// CHECK:STDOUT: "jsonrpc": "2.0",
|
|
// CHECK:STDOUT: "method": "textDocument/publishDiagnostics",
|
|
// CHECK:STDOUT: "params": {
|
|
// CHECK:STDOUT: "diagnostics": [],
|
|
// CHECK:STDOUT: "uri": "file:///empty.carbon"
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT: }Content-Length: 49{{\r}}
|
|
// CHECK:STDOUT: {{\r}}
|
|
// CHECK:STDOUT: {
|
|
// CHECK:STDOUT: "id": 4,
|
|
// CHECK:STDOUT: "jsonrpc": "2.0",
|
|
// CHECK:STDOUT: "result": []
|
|
// CHECK:STDOUT: }Content-Length: 51{{\r}}
|
|
// CHECK:STDOUT: {{\r}}
|
|
// CHECK:STDOUT: {
|
|
// CHECK:STDOUT: "id": 5,
|
|
// CHECK:STDOUT: "jsonrpc": "2.0",
|
|
// CHECK:STDOUT: "result": null
|
|
// CHECK:STDOUT: }
|