Browse Source

Merge pull request #32403 from yeonghoey/enforce4space

Print errors when tab indent found in [codeblock]
Rémi Verschelde 5 years ago
parent
commit
c9781df316

+ 1 - 1
doc/classes/HTTPClient.xml

@@ -69,7 +69,7 @@
 				[codeblock]
 				[codeblock]
 				{
 				{
 				    "content-length": 12,
 				    "content-length": 12,
-					"Content-Type": "application/json; charset=UTF-8",
+				    "Content-Type": "application/json; charset=UTF-8",
 				}
 				}
 				[/codeblock]
 				[/codeblock]
 			</description>
 			</description>

+ 3 - 3
doc/classes/SceneTree.xml

@@ -69,9 +69,9 @@
 				Commonly used to create a one-shot delay timer as in the following example:
 				Commonly used to create a one-shot delay timer as in the following example:
 				[codeblock]
 				[codeblock]
 				func some_function():
 				func some_function():
-					print("start")
-					yield(get_tree().create_timer(1.0), "timeout")
-					print("end")
+				    print("start")
+				    yield(get_tree().create_timer(1.0), "timeout")
+				    print("end")
 				[/codeblock]
 				[/codeblock]
 			</description>
 			</description>
 		</method>
 		</method>

+ 5 - 0
doc/tools/makerst.py

@@ -608,8 +608,10 @@ def rstize_text(text, state):  # type: (str, State) -> str
             break
             break
 
 
         pre_text = text[:pos]
         pre_text = text[:pos]
+        indent_level = 0
         while text[pos + 1] == '\t':
         while text[pos + 1] == '\t':
             pos += 1
             pos += 1
+            indent_level += 1
         post_text = text[pos + 1:]
         post_text = text[pos + 1:]
 
 
         # Handle codeblocks
         # Handle codeblocks
@@ -633,6 +635,9 @@ def rstize_text(text, state):  # type: (str, State) -> str
                 while code_pos + to_skip + 1 < len(code_text) and code_text[code_pos + to_skip + 1] == '\t':
                 while code_pos + to_skip + 1 < len(code_text) and code_text[code_pos + to_skip + 1] == '\t':
                     to_skip += 1
                     to_skip += 1
 
 
+                if to_skip > indent_level:
+                    print_error("Four spaces should be used for indentation within [codeblock], file: {}".format(state.current_class), state)
+
                 if len(code_text[code_pos + to_skip + 1:]) == 0:
                 if len(code_text[code_pos + to_skip + 1:]) == 0:
                     code_text = code_text[:code_pos] + "\n"
                     code_text = code_text[:code_pos] + "\n"
                     code_pos += 1
                     code_pos += 1

+ 4 - 4
modules/gdscript/doc_classes/@GDScript.xml

@@ -590,10 +590,10 @@
 				extends Sprite
 				extends Sprite
 				var elapsed = 0.0
 				var elapsed = 0.0
 				func _process(delta):
 				func _process(delta):
-					var min_angle = deg2rad(0.0)
-					var max_angle = deg2rad(90.0)
-					rotation = lerp_angle(min_angle, max_angle, elapsed)
-					elapsed += delta
+				    var min_angle = deg2rad(0.0)
+				    var max_angle = deg2rad(90.0)
+				    rotation = lerp_angle(min_angle, max_angle, elapsed)
+				    elapsed += delta
 				[/codeblock]
 				[/codeblock]
 			</description>
 			</description>
 		</method>
 		</method>