Skip to content

Commit e7ae1bd

Browse files
committed
Ensure that class_name A extends B wraps on two lines, according to the official style guide
Close #89
1 parent 311d368 commit e7ae1bd

12 files changed

+24
-13
lines changed

queries/gdscript.scm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
(#delimiter! "\n"))
9090
(source
9191
(class_name_statement
92-
extends: (extends_statement) @prepend_space)
92+
extends: (extends_statement) @prepend_hardline)
9393
@append_delimiter @append_hardline (#delimiter! "\n"))
9494

9595
; CONST DEFINITIONS

tests/code_order/sample_unordered.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
class_name TestClass extends Node
44

55
## This is a docstring for the test class
6-
76
func _enter_tree():
87
pass
98

@@ -59,6 +58,7 @@ class InnerClass:
5958
class _PrivateInnerClass:
6059
var _inner_private: String = "inner"
6160

61+
6262
signal test_signal(value: int)
6363

6464
enum TestEnum { OPTION_A, OPTION_B, OPTION_C }

tests/expected/class_name.gd

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
class_name Player extends CharacterBody2D
1+
class_name Player
2+
extends CharacterBody2D
23

3-
class_name UI extends Control
4+
class_name UI
5+
extends Control

tests/expected/comments_basic.gd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# first line comment
22
@tool
3-
class_name Aaa extends Node
3+
class_name Aaa
4+
extends Node
45

56
# after extends comment
67

tests/expected/extends_basic.gd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
class_name MyNode extends Node
1+
class_name MyNode
2+
extends Node
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# comment
2-
class_name MyNode extends Node
2+
class_name MyNode
3+
extends Node
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# comment
2-
class_name MyNode extends "res:/path.gd"
2+
class_name MyNode
3+
extends "res:/path.gd"
34

45
var a = 10

tests/expected/extends_one_var.gd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
class_name MyNode extends Node
1+
class_name MyNode
2+
extends Node
23

34
var a = 10
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
class_name MyNode extends "res:/path.gd"
1+
class_name MyNode
2+
extends "res:/path.gd"
23

34
var a = 10
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
class_name MyNode extends "res:/path.gd"
1+
class_name MyNode
2+
extends "res:/path.gd"
23

34
var a = 10

0 commit comments

Comments
 (0)