mirror of
				https://gitea.invidious.io/iv-org/shard-ameba.git
				synced 2024-08-15 00:53:29 +00:00 
			
		
		
		
	Several refactors in Style/GuardClause rule
				
					
				
			Mostly readability related
This commit is contained in:
		
							parent
							
								
									353c0a1583
								
							
						
					
					
						commit
						ed6085e6a6
					
				
					 1 changed files with 6 additions and 4 deletions
				
			
		| 
						 | 
					@ -75,8 +75,8 @@ module Ameba::Rule::Style
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      case final_expression
 | 
					      case final_expression
 | 
				
			||||||
      when Crystal::If     then check_ending_if(source, final_expression)
 | 
					      when Crystal::If, Crystal::Unless
 | 
				
			||||||
      when Crystal::Unless then check_ending_if(source, final_expression)
 | 
					        check_ending_if(source, final_expression)
 | 
				
			||||||
      end
 | 
					      end
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -92,7 +92,8 @@ module Ameba::Rule::Style
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      return unless guard_clause && parent && conditional_keyword
 | 
					      return unless guard_clause && parent && conditional_keyword
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      report_issue(source, node, guard_clause_source(source, guard_clause, parent), conditional_keyword)
 | 
					      guard_clause_source = guard_clause_source(source, guard_clause, parent)
 | 
				
			||||||
 | 
					      report_issue(source, node, guard_clause_source, conditional_keyword)
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private def check_ending_if(source, node)
 | 
					    private def check_ending_if(source, node)
 | 
				
			||||||
| 
						 | 
					@ -116,7 +117,8 @@ module Ameba::Rule::Style
 | 
				
			||||||
        end_loc = end_end_loc.adjust(column_number: {{1 - "end".size}})
 | 
					        end_loc = end_end_loc.adjust(column_number: {{1 - "end".size}})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        issue_for keyword_loc, keyword_end_loc, MSG % example do |corrector|
 | 
					        issue_for keyword_loc, keyword_end_loc, MSG % example do |corrector|
 | 
				
			||||||
          corrector.replace(keyword_loc, keyword_end_loc, "#{scope_exiting_keyword} #{conditional_keyword}")
 | 
					          replacement = "#{scope_exiting_keyword} #{conditional_keyword}"
 | 
				
			||||||
 | 
					          corrector.replace(keyword_loc, keyword_end_loc, replacement)
 | 
				
			||||||
          corrector.remove(end_loc, end_end_loc)
 | 
					          corrector.remove(end_loc, end_end_loc)
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
      else
 | 
					      else
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue