Skip to content

[SourceKit] Add an operator syntax kind #60210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2022
Merged

[SourceKit] Add an operator syntax kind #60210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/swift/IDE/SyntaxModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ namespace ide {
enum class SyntaxNodeKind : uint8_t {
Keyword,
Identifier,
Operator,
DollarIdent,
Integer,
Floating,
Expand Down
15 changes: 13 additions & 2 deletions lib/IDE/SyntaxModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,20 @@ SyntaxModelContext::SyntaxModelContext(SourceFile &SrcFile)
break;

case tok::oper_prefix:
if (Tok.getText() == "-")
if (Tok.getText() == "-" && I != E &&
(Tokens[I+1].getKind() == tok::integer_literal ||
Tokens[I+1].getKind() == tok::floating_literal)) {
UnaryMinusLoc = Loc;
continue;
continue;
} else {
Kind = SyntaxNodeKind::Operator;
break;
}
case tok::oper_postfix:
case tok::oper_binary_spaced:
case tok::oper_binary_unspaced:
Kind = SyntaxNodeKind::Operator;
break;

case tok::comment:
if (Tok.getText().startswith("///") ||
Expand Down
40 changes: 40 additions & 0 deletions test/SourceKit/DocSupport/doc_clang_module.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,11 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.offset: 189,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 194,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 198,
Expand Down Expand Up @@ -617,6 +622,11 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.offset: 427,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 432,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 436,
Expand Down Expand Up @@ -797,6 +807,11 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.offset: 697,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 702,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 706,
Expand Down Expand Up @@ -1018,6 +1033,11 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.offset: 1045,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 1050,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 1054,
Expand Down Expand Up @@ -1162,6 +1182,11 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.offset: 1316,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 1321,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 1325,
Expand Down Expand Up @@ -1302,6 +1327,11 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.offset: 1547,
key.length: 17
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 1565,
key.length: 2
},
{
key.kind: source.lang.swift.ref.generic_type_param,
key.name: "S",
Expand Down Expand Up @@ -4313,6 +4343,11 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.offset: 7269,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 7274,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 7278,
Expand Down Expand Up @@ -4483,6 +4518,11 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.offset: 7542,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 7547,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 7551,
Expand Down
5 changes: 5 additions & 0 deletions test/SourceKit/DocSupport/doc_clang_module.swift.sub.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.offset: 212,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 217,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 221,
Expand Down
15 changes: 15 additions & 0 deletions test/SourceKit/DocSupport/doc_source_file.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@
key.offset: 288,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 293,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
key.offset: 295,
Expand Down Expand Up @@ -1668,6 +1673,11 @@
key.offset: 1935,
key.length: 7
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 1943,
key.length: 2
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int",
Expand Down Expand Up @@ -1695,6 +1705,11 @@
key.offset: 1980,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 1985,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.parameter,
key.offset: 1987,
Expand Down
25 changes: 25 additions & 0 deletions test/SourceKit/DocSupport/doc_swift_module.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,11 @@ func shouldPrintAnyAsKeyword(x x: Any)
key.offset: 750,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 755,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 759,
Expand Down Expand Up @@ -903,6 +908,11 @@ func shouldPrintAnyAsKeyword(x x: Any)
key.offset: 1003,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 1008,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 1012,
Expand Down Expand Up @@ -1312,6 +1322,11 @@ func shouldPrintAnyAsKeyword(x x: Any)
key.offset: 1600,
key.length: 7
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 1608,
key.length: 2
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int",
Expand Down Expand Up @@ -1445,6 +1460,11 @@ func shouldPrintAnyAsKeyword(x x: Any)
key.offset: 1813,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 1818,
key.length: 2
},
{
key.kind: source.lang.swift.syntaxtype.argument,
key.offset: 1822,
Expand Down Expand Up @@ -1805,6 +1825,11 @@ func shouldPrintAnyAsKeyword(x x: Any)
key.offset: 2183,
key.length: 7
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 2191,
key.length: 2
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "Int",
Expand Down
5 changes: 5 additions & 0 deletions test/SourceKit/DocSupport/doc_system_module_underscored.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,11 @@ protocol Other1 {
key.offset: 227,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 229,
key.length: 2
},
{
key.kind: source.lang.swift.ref.struct,
key.name: "String",
Expand Down
15 changes: 15 additions & 0 deletions test/SourceKit/InterfaceGen/gen_clang_module.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3313,6 +3313,11 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {
key.offset: 6386,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 6397,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 6400,
Expand Down Expand Up @@ -3358,6 +3363,11 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {
key.offset: 6480,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 6486,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.attribute.builtin,
key.offset: 6493,
Expand Down Expand Up @@ -3438,6 +3448,11 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {
key.offset: 6661,
key.length: 10
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 6672,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 6675,
Expand Down
3 changes: 2 additions & 1 deletion test/SourceKit/SyntaxMapData/Inputs/syntaxmap.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ func bar() {}
// mailto:thisisnotmail
// unknownprotocol://awesomeguy.com

_ = -123
let a = -123
let b = -a

func testArgumentLabels(in class: Int, _ case: (_ default: Int) -> Void) -> (in: Int, String) {
let result: (in: Int, String) = (0, "test")
Expand Down
20 changes: 20 additions & 0 deletions test/SourceKit/SyntaxMapData/syntaxmap-edit-chained-comment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
// CHECK-NEXT: key.length: 6
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.operator,
// CHECK-NEXT: key.offset: 14,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.comment,
// CHECK-NEXT: key.offset: 16,
// CHECK-NEXT: key.length: 6
Expand All @@ -44,6 +49,16 @@
// CHECK-NEXT: key.diagnostic_stage: source.diagnostic.stage.swift.parse,
// CHECK-NEXT: key.syntaxmap: [
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.operator,
// CHECK-NEXT: key.offset: 9,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.operator,
// CHECK-NEXT: key.offset: 12,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.comment,
// CHECK-NEXT: key.offset: 13,
// CHECK-NEXT: key.length: 6
Expand All @@ -63,6 +78,11 @@
// CHECK-NEXT: key.length: 6
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.operator,
// CHECK-NEXT: key.offset: 14,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.comment,
// CHECK-NEXT: key.offset: 16,
// CHECK-NEXT: key.length: 6
Expand Down
25 changes: 25 additions & 0 deletions test/SourceKit/SyntaxMapData/syntaxmap-multiple-edits.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,31 @@
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.operator,
// CHECK-NEXT: key.offset: 135,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.identifier,
// CHECK-NEXT: key.offset: 136,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.operator,
// CHECK-NEXT: key.offset: 138,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.identifier,
// CHECK-NEXT: key.offset: 140,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.operator,
// CHECK-NEXT: key.offset: 141,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.identifier,
// CHECK-NEXT: key.offset: 142,
// CHECK-NEXT: key.length: 1
Expand Down Expand Up @@ -209,11 +224,21 @@
// CHECK-NEXT: key.length: 2
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.operator,
// CHECK-NEXT: key.offset: 56,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.number,
// CHECK-NEXT: key.offset: 58,
// CHECK-NEXT: key.length: 2
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.operator,
// CHECK-NEXT: key.offset: 61,
// CHECK-NEXT: key.length: 1
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.number,
// CHECK-NEXT: key.offset: 63,
// CHECK-NEXT: key.length: 3
Expand Down
5 changes: 5 additions & 0 deletions test/SourceKit/SyntaxMapData/syntaxmap-pound-keyword.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@
key.offset: 195,
key.length: 3
},
{
key.kind: source.lang.swift.syntaxtype.operator,
key.offset: 200,
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.buildconfig.keyword,
key.offset: 207,
Expand Down
Loading