@herb-tools/node 0.8.7 → 0.8.9

package/extension/libherb/ast_pretty_print.c

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/src/ast_pretty_print.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/src/ast_pretty_print.c.erb
 
 #include "include/analyze_helpers.h"
 #include "include/ast_node.h"
@@ -265,6 +265,19 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_token_property(erb_if_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
       pretty_print_token_property(erb_if_node->content, hb_string("content"), indent, relative_indent, false, buffer);
       pretty_print_token_property(erb_if_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, false, buffer);
+      pretty_print_label(hb_string("then_keyword"), indent, relative_indent, false, buffer);
+      if (erb_if_node->then_keyword) {
+        char then_keyword_location_string[128];
+        sprintf(then_keyword_location_string, " (location: (%u:%u)-(%u:%u))\n",
+          erb_if_node->then_keyword->start.line,
+          erb_if_node->then_keyword->start.column,
+          erb_if_node->then_keyword->end.line,
+          erb_if_node->then_keyword->end.column);
+        hb_buffer_append(buffer, then_keyword_location_string);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+
       pretty_print_array(hb_string("statements"), erb_if_node->statements, indent, relative_indent, false, buffer);
 
       pretty_print_label(hb_string("subsequent"), indent, relative_indent, false, buffer);
@@ -330,6 +343,19 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_token_property(erb_when_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
       pretty_print_token_property(erb_when_node->content, hb_string("content"), indent, relative_indent, false, buffer);
       pretty_print_token_property(erb_when_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, false, buffer);
+      pretty_print_label(hb_string("then_keyword"), indent, relative_indent, false, buffer);
+      if (erb_when_node->then_keyword) {
+        char then_keyword_location_string[128];
+        sprintf(then_keyword_location_string, " (location: (%u:%u)-(%u:%u))\n",
+          erb_when_node->then_keyword->start.line,
+          erb_when_node->then_keyword->start.column,
+          erb_when_node->then_keyword->end.line,
+          erb_when_node->then_keyword->end.column);
+        hb_buffer_append(buffer, then_keyword_location_string);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+
       pretty_print_array(hb_string("statements"), erb_when_node->statements, indent, relative_indent, true, buffer);
     } break;
 
@@ -602,6 +628,19 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_token_property(erb_unless_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
       pretty_print_token_property(erb_unless_node->content, hb_string("content"), indent, relative_indent, false, buffer);
       pretty_print_token_property(erb_unless_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, false, buffer);
+      pretty_print_label(hb_string("then_keyword"), indent, relative_indent, false, buffer);
+      if (erb_unless_node->then_keyword) {
+        char then_keyword_location_string[128];
+        sprintf(then_keyword_location_string, " (location: (%u:%u)-(%u:%u))\n",
+          erb_unless_node->then_keyword->start.line,
+          erb_unless_node->then_keyword->start.column,
+          erb_unless_node->then_keyword->end.line,
+          erb_unless_node->then_keyword->end.column);
+        hb_buffer_append(buffer, then_keyword_location_string);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+
       pretty_print_array(hb_string("statements"), erb_unless_node->statements, indent, relative_indent, false, buffer);
 
       pretty_print_label(hb_string("else_clause"), indent, relative_indent, false, buffer);
@@ -651,6 +690,19 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_token_property(erb_in_node->tag_opening, hb_string("tag_opening"), indent, relative_indent, false, buffer);
       pretty_print_token_property(erb_in_node->content, hb_string("content"), indent, relative_indent, false, buffer);
       pretty_print_token_property(erb_in_node->tag_closing, hb_string("tag_closing"), indent, relative_indent, false, buffer);
+      pretty_print_label(hb_string("then_keyword"), indent, relative_indent, false, buffer);
+      if (erb_in_node->then_keyword) {
+        char then_keyword_location_string[128];
+        sprintf(then_keyword_location_string, " (location: (%u:%u)-(%u:%u))\n",
+          erb_in_node->then_keyword->start.line,
+          erb_in_node->then_keyword->start.column,
+          erb_in_node->then_keyword->end.line,
+          erb_in_node->then_keyword->end.column);
+        hb_buffer_append(buffer, then_keyword_location_string);
+      } else {
+        hb_buffer_append(buffer, " ∅\n");
+      }
+
       pretty_print_array(hb_string("statements"), erb_in_node->statements, indent, relative_indent, true, buffer);
     } break;
 

package/extension/libherb/ast_pretty_print.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/src/include/ast_pretty_print.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/src/include/ast_pretty_print.h.erb
 
 #ifndef HERB_AST_PRETTY_PRINT_H
 #define HERB_AST_PRETTY_PRINT_H

package/extension/libherb/errors.c

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/src/errors.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/src/errors.c.erb
 
 #include "include/errors.h"
 #include "include/location.h"

package/extension/libherb/errors.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/src/include/errors.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/src/include/errors.h.erb
 
 #ifndef HERB_ERRORS_H
 #define HERB_ERRORS_H

package/extension/libherb/include/analyze_helpers.h

@@ -25,9 +25,15 @@ bool has_rescue_node(analyzed_ruby_T* analyzed);
 bool has_ensure_node(analyzed_ruby_T* analyzed);
 bool has_unless_node(analyzed_ruby_T* analyzed);
 bool has_yield_node(analyzed_ruby_T* analyzed);
+bool has_then_keyword(analyzed_ruby_T* analyzed);
 
 bool has_error_message(analyzed_ruby_T* anlayzed, const char* message);
 
+bool is_do_block(pm_location_t opening_location);
+bool is_brace_block(pm_location_t opening_location);
+bool is_closing_brace(pm_location_t location);
+bool has_valid_block_closing(pm_location_t opening_loc, pm_location_t closing_loc);
+
 bool search_if_nodes(const pm_node_t* node, void* data);
 bool search_block_nodes(const pm_node_t* node, void* data);
 bool search_case_nodes(const pm_node_t* node, void* data);
@@ -46,6 +52,7 @@ bool search_in_nodes(analyzed_ruby_T* analyzed);
 bool search_rescue_nodes(analyzed_ruby_T* analyzed);
 bool search_ensure_nodes(analyzed_ruby_T* analyzed);
 bool search_yield_nodes(const pm_node_t* node, void* data);
+bool search_then_keywords(const pm_node_t* node, void* data);
 bool search_unclosed_control_flows(const pm_node_t* node, void* data);
 
 void check_erb_node_for_missing_end(const AST_NODE_T* node);

package/extension/libherb/include/analyzed_ruby.h

@@ -29,6 +29,7 @@ typedef struct ANALYZED_RUBY_STRUCT {
   int ensure_node_count;
   int unless_node_count;
   int yield_node_count;
+  int then_keyword_count;
   int unclosed_control_flow_count;
 } analyzed_ruby_T;
 

package/extension/libherb/include/ast_nodes.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/src/include/ast_nodes.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/src/include/ast_nodes.h.erb
 
 #ifndef HERB_AST_NODES_H
 #define HERB_AST_NODES_H
@@ -183,6 +183,7 @@ typedef struct AST_ERB_IF_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
+  location_T* then_keyword;
   hb_array_T* statements;
   struct AST_NODE_STRUCT* subsequent;
   struct AST_ERB_END_NODE_STRUCT* end_node;
@@ -202,6 +203,7 @@ typedef struct AST_ERB_WHEN_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
+  location_T* then_keyword;
   hb_array_T* statements;
 } AST_ERB_WHEN_NODE_T;
 
@@ -288,6 +290,7 @@ typedef struct AST_ERB_UNLESS_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
+  location_T* then_keyword;
   hb_array_T* statements;
   struct AST_ERB_ELSE_NODE_STRUCT* else_clause;
   struct AST_ERB_END_NODE_STRUCT* end_node;
@@ -305,6 +308,7 @@ typedef struct AST_ERB_IN_NODE_STRUCT {
   token_T* tag_opening;
   token_T* content;
   token_T* tag_closing;
+  location_T* then_keyword;
   hb_array_T* statements;
 } AST_ERB_IN_NODE_T;
 
@@ -325,9 +329,9 @@ AST_WHITESPACE_NODE_T* ast_whitespace_node_init(token_T* value, position_T start
 AST_ERB_CONTENT_NODE_T* ast_erb_content_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, analyzed_ruby_T* analyzed_ruby, bool parsed, bool valid, position_T start_position, position_T end_position, hb_array_T* errors);
 AST_ERB_END_NODE_T* ast_erb_end_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, position_T start_position, position_T end_position, hb_array_T* errors);
 AST_ERB_ELSE_NODE_T* ast_erb_else_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
-AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_NODE_STRUCT* subsequent, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, location_T* then_keyword, hb_array_T* statements, struct AST_NODE_STRUCT* subsequent, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
 AST_ERB_BLOCK_NODE_T* ast_erb_block_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* body, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
-AST_ERB_WHEN_NODE_T* ast_erb_when_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_WHEN_NODE_T* ast_erb_when_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, location_T* then_keyword, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
 AST_ERB_CASE_NODE_T* ast_erb_case_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* children, hb_array_T* conditions, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
 AST_ERB_CASE_MATCH_NODE_T* ast_erb_case_match_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* children, hb_array_T* conditions, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
 AST_ERB_WHILE_NODE_T* ast_erb_while_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
@@ -336,9 +340,9 @@ AST_ERB_FOR_NODE_T* ast_erb_for_node_init(token_T* tag_opening, token_T* content
 AST_ERB_RESCUE_NODE_T* ast_erb_rescue_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_ERB_RESCUE_NODE_STRUCT* subsequent, position_T start_position, position_T end_position, hb_array_T* errors);
 AST_ERB_ENSURE_NODE_T* ast_erb_ensure_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
 AST_ERB_BEGIN_NODE_T* ast_erb_begin_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_ERB_RESCUE_NODE_STRUCT* rescue_clause, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_ENSURE_NODE_STRUCT* ensure_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
-AST_ERB_UNLESS_NODE_T* ast_erb_unless_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_UNLESS_NODE_T* ast_erb_unless_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, location_T* then_keyword, hb_array_T* statements, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T start_position, position_T end_position, hb_array_T* errors);
 AST_ERB_YIELD_NODE_T* ast_erb_yield_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, position_T start_position, position_T end_position, hb_array_T* errors);
-AST_ERB_IN_NODE_T* ast_erb_in_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
+AST_ERB_IN_NODE_T* ast_erb_in_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, location_T* then_keyword, hb_array_T* statements, position_T start_position, position_T end_position, hb_array_T* errors);
 
 hb_string_T ast_node_type_to_string(AST_NODE_T* node);
 hb_string_T ast_node_human_type(AST_NODE_T* node);

package/extension/libherb/include/ast_pretty_print.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/src/include/ast_pretty_print.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/src/include/ast_pretty_print.h.erb
 
 #ifndef HERB_AST_PRETTY_PRINT_H
 #define HERB_AST_PRETTY_PRINT_H

package/extension/libherb/include/errors.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/src/include/errors.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/src/include/errors.h.erb
 
 #ifndef HERB_ERRORS_H
 #define HERB_ERRORS_H

package/extension/libherb/include/location.h

@@ -19,4 +19,8 @@ void location_from(
   uint32_t end_column
 );
 
+void location_from_positions(location_T* location, position_T start, position_T end);
+
+location_T* location_create(position_T start, position_T end);
+
 #endif

package/extension/libherb/include/prism_helpers.h

@@ -1,8 +1,10 @@
 #ifndef HERB_PRISM_HELPERS_H
 #define HERB_PRISM_HELPERS_H
 
+#include "analyzed_ruby.h"
 #include "ast_nodes.h"
 #include "errors.h"
+#include "location.h"
 #include "position.h"
 
 #include <prism.h>
@@ -22,4 +24,8 @@ RUBY_PARSE_ERROR_T* ruby_parse_error_from_prism_error_with_positions(
   position_T end
 );
 
+location_T* get_then_keyword_location(analyzed_ruby_T* analyzed, const char* source);
+location_T* get_then_keyword_location_wrapped(const char* source, bool is_in_clause);
+location_T* get_then_keyword_location_elsif_wrapped(const char* source);
+
 #endif

package/extension/libherb/include/version.h

@@ -1,6 +1,6 @@
 #ifndef HERB_VERSION_H
 #define HERB_VERSION_H
 
-#define HERB_VERSION "0.8.7"
+#define HERB_VERSION "0.8.9"
 
 #endif

package/extension/libherb/location.c

@@ -11,3 +11,19 @@ void location_from(
   location->start = (position_T) { .line = start_line, .column = start_column };
   location->end = (position_T) { .line = end_line, .column = end_column };
 }
+
+void location_from_positions(location_T* location, position_T start, position_T end) {
+  location->start = start;
+  location->end = end;
+}
+
+location_T* location_create(position_T start, position_T end) {
+  location_T* location = malloc(sizeof(location_T));
+
+  if (location != NULL) {
+    location->start = start;
+    location->end = end;
+  }
+
+  return location;
+}

package/extension/libherb/location.h

@@ -19,4 +19,8 @@ void location_from(
   uint32_t end_column
 );
 
+void location_from_positions(location_T* location, position_T start, position_T end);
+
+location_T* location_create(position_T start, position_T end);
+
 #endif

package/extension/libherb/parser_match_tags.c

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/src/parser_match_tags.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/src/parser_match_tags.c.erb
 
 #include "include/parser.h"
 #include "include/ast_nodes.h"

package/extension/libherb/prism_helpers.c

@@ -1,10 +1,14 @@
 #include "include/prism_helpers.h"
 #include "include/ast_nodes.h"
 #include "include/errors.h"
+#include "include/location.h"
 #include "include/position.h"
 #include "include/util.h"
+#include "include/util/hb_buffer.h"
 
 #include <prism.h>
+#include <stdlib.h>
+#include <string.h>
 
 const char* pm_error_level_to_string(pm_error_level_t level) {
   switch (level) {
@@ -50,3 +54,187 @@ RUBY_PARSE_ERROR_T* ruby_parse_error_from_prism_error_with_positions(
     end
   );
 }
+
+typedef struct {
+  pm_location_t then_keyword_loc;
+  bool found;
+} then_keyword_search_context_T;
+
+static bool has_pm_location(pm_location_t location) {
+  return location.start != NULL && location.end != NULL && (location.end - location.start) > 0;
+}
+
+static bool search_then_keyword_location(const pm_node_t* node, void* data) {
+  then_keyword_search_context_T* context = (then_keyword_search_context_T*) data;
+
+  if (context->found) { return false; }
+
+  switch (node->type) {
+    case PM_IF_NODE: {
+      const pm_if_node_t* if_node = (const pm_if_node_t*) node;
+      if (has_pm_location(if_node->then_keyword_loc)) {
+        context->then_keyword_loc = if_node->then_keyword_loc;
+        context->found = true;
+        return false;
+      }
+      break;
+    }
+
+    case PM_UNLESS_NODE: {
+      const pm_unless_node_t* unless_node = (const pm_unless_node_t*) node;
+      if (has_pm_location(unless_node->then_keyword_loc)) {
+        context->then_keyword_loc = unless_node->then_keyword_loc;
+        context->found = true;
+        return false;
+      }
+      break;
+    }
+
+    case PM_WHEN_NODE: {
+      const pm_when_node_t* when_node = (const pm_when_node_t*) node;
+      if (has_pm_location(when_node->then_keyword_loc)) {
+        context->then_keyword_loc = when_node->then_keyword_loc;
+        context->found = true;
+        return false;
+      }
+      break;
+    }
+
+    case PM_IN_NODE: {
+      const pm_in_node_t* in_node = (const pm_in_node_t*) node;
+      if (has_pm_location(in_node->then_loc)) {
+        context->then_keyword_loc = in_node->then_loc;
+        context->found = true;
+        return false;
+      }
+      break;
+    }
+
+    default: break;
+  }
+
+  pm_visit_child_nodes(node, search_then_keyword_location, context);
+
+  return false;
+}
+
+location_T* get_then_keyword_location(analyzed_ruby_T* analyzed, const char* source) {
+  if (analyzed == NULL || analyzed->root == NULL || source == NULL) { return NULL; }
+
+  then_keyword_search_context_T context = { .then_keyword_loc = { .start = NULL, .end = NULL }, .found = false };
+
+  pm_visit_child_nodes(analyzed->root, search_then_keyword_location, &context);
+
+  if (!context.found) { return NULL; }
+
+  size_t start_offset = (size_t) (context.then_keyword_loc.start - analyzed->parser.start);
+  size_t end_offset = (size_t) (context.then_keyword_loc.end - analyzed->parser.start);
+
+  position_T start_position = position_from_source_with_offset(source, start_offset);
+  position_T end_position = position_from_source_with_offset(source, end_offset);
+
+  return location_create(start_position, end_position);
+}
+
+static location_T* parse_wrapped_and_find_then_keyword(
+  hb_buffer_T* buffer,
+  const char* source,
+  size_t source_length,
+  size_t prefix_length,
+  size_t adjustment_threshold,
+  size_t adjustment_amount
+) {
+  pm_parser_t parser;
+  pm_parser_init(&parser, (const uint8_t*) hb_buffer_value(buffer), hb_buffer_length(buffer), NULL);
+  pm_node_t* root = pm_parse(&parser);
+
+  if (root == NULL) {
+    pm_parser_free(&parser);
+
+    return NULL;
+  }
+
+  then_keyword_search_context_T context = { .then_keyword_loc = { .start = NULL, .end = NULL }, .found = false };
+
+  pm_visit_child_nodes(root, search_then_keyword_location, &context);
+
+  location_T* location = NULL;
+
+  if (context.found) {
+    size_t start_offset = (size_t) (context.then_keyword_loc.start - parser.start);
+    size_t end_offset = (size_t) (context.then_keyword_loc.end - parser.start);
+
+    if (start_offset >= prefix_length && end_offset >= prefix_length) {
+      start_offset -= prefix_length;
+      end_offset -= prefix_length;
+
+      if (start_offset > adjustment_threshold) {
+        start_offset += adjustment_amount;
+        end_offset += adjustment_amount;
+      }
+
+      if (start_offset <= source_length && end_offset <= source_length) {
+        position_T start_position = position_from_source_with_offset(source, start_offset);
+        position_T end_position = position_from_source_with_offset(source, end_offset);
+
+        location = location_create(start_position, end_position);
+      }
+    }
+  }
+
+  pm_node_destroy(&parser, root);
+  pm_parser_free(&parser);
+
+  return location;
+}
+
+location_T* get_then_keyword_location_wrapped(const char* source, bool is_in_clause) {
+  if (source == NULL) { return NULL; }
+
+  size_t source_length = strlen(source);
+
+  hb_buffer_T buffer;
+
+  if (!hb_buffer_init(&buffer, source_length + 16)) { return NULL; }
+
+  hb_buffer_append(&buffer, "case x\n");
+  size_t prefix_length = hb_buffer_length(&buffer);
+  hb_buffer_append(&buffer, source);
+  hb_buffer_append(&buffer, "\nend");
+
+  location_T* location =
+    parse_wrapped_and_find_then_keyword(&buffer, source, source_length, prefix_length, SIZE_MAX, 0);
+
+  free(buffer.value);
+
+  return location;
+}
+
+location_T* get_then_keyword_location_elsif_wrapped(const char* source) {
+  if (source == NULL) { return NULL; }
+
+  const char* elsif_position = strstr(source, "elsif");
+
+  if (elsif_position == NULL) { return NULL; }
+
+  size_t source_length = strlen(source);
+  size_t elsif_offset = (size_t) (elsif_position - source);
+  size_t replacement_diff = strlen("elsif") - strlen("if");
+
+  hb_buffer_T buffer;
+
+  if (!hb_buffer_init(&buffer, source_length + 8)) { return NULL; }
+
+  hb_buffer_append_with_length(&buffer, source, elsif_offset);
+  hb_buffer_append(&buffer, "if");
+  size_t if_end_offset = hb_buffer_length(&buffer);
+  hb_buffer_append(&buffer, source + elsif_offset + strlen("elsif"));
+  hb_buffer_append(&buffer, "\nend");
+
+  location_T* location =
+    parse_wrapped_and_find_then_keyword(&buffer, source, source_length, 0, if_end_offset, replacement_diff);
+
+  free(buffer.value);
+
+  return location;
+}

package/extension/libherb/prism_helpers.h

@@ -1,8 +1,10 @@
 #ifndef HERB_PRISM_HELPERS_H
 #define HERB_PRISM_HELPERS_H
 
+#include "analyzed_ruby.h"
 #include "ast_nodes.h"
 #include "errors.h"
+#include "location.h"
 #include "position.h"
 
 #include <prism.h>
@@ -22,4 +24,8 @@ RUBY_PARSE_ERROR_T* ruby_parse_error_from_prism_error_with_positions(
   position_T end
 );
 
+location_T* get_then_keyword_location(analyzed_ruby_T* analyzed, const char* source);
+location_T* get_then_keyword_location_wrapped(const char* source, bool is_in_clause);
+location_T* get_then_keyword_location_elsif_wrapped(const char* source);
+
 #endif

package/extension/libherb/version.h

@@ -1,6 +1,6 @@
 #ifndef HERB_VERSION_H
 #define HERB_VERSION_H
 
-#define HERB_VERSION "0.8.7"
+#define HERB_VERSION "0.8.9"
 
 #endif

package/extension/libherb/visitor.c

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/src/visitor.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/src/visitor.c.erb
 
 #include <stdio.h>
 

package/extension/nodes.cpp

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/javascript/packages/node/extension/nodes.cpp.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/javascript/packages/node/extension/nodes.cpp.erb
 
 #include <node_api.h>
 #include "error_helpers.h"
@@ -581,6 +581,14 @@ napi_value erb_if_nodeNodeFromCStruct(napi_env env, AST_ERB_IF_NODE_T* erb_if_no
   napi_value tag_closing = CreateToken(env, erb_if_node->tag_closing);
   napi_set_named_property(env, result, "tag_closing", tag_closing);
 
+  napi_value then_keyword;
+  if (erb_if_node->then_keyword != NULL) {
+    then_keyword = CreateLocation(env, *erb_if_node->then_keyword);
+  } else {
+    napi_get_null(env, &then_keyword);
+  }
+  napi_set_named_property(env, result, "then_keyword", then_keyword);
+
   napi_value statements = NodesArrayFromCArray(env, erb_if_node->statements);
   napi_set_named_property(env, result, "statements", statements);
 
@@ -658,6 +666,14 @@ napi_value erb_when_nodeNodeFromCStruct(napi_env env, AST_ERB_WHEN_NODE_T* erb_w
   napi_value tag_closing = CreateToken(env, erb_when_node->tag_closing);
   napi_set_named_property(env, result, "tag_closing", tag_closing);
 
+  napi_value then_keyword;
+  if (erb_when_node->then_keyword != NULL) {
+    then_keyword = CreateLocation(env, *erb_when_node->then_keyword);
+  } else {
+    napi_get_null(env, &then_keyword);
+  }
+  napi_set_named_property(env, result, "then_keyword", then_keyword);
+
   napi_value statements = NodesArrayFromCArray(env, erb_when_node->statements);
   napi_set_named_property(env, result, "statements", statements);
 
@@ -1006,6 +1022,14 @@ napi_value erb_unless_nodeNodeFromCStruct(napi_env env, AST_ERB_UNLESS_NODE_T* e
   napi_value tag_closing = CreateToken(env, erb_unless_node->tag_closing);
   napi_set_named_property(env, result, "tag_closing", tag_closing);
 
+  napi_value then_keyword;
+  if (erb_unless_node->then_keyword != NULL) {
+    then_keyword = CreateLocation(env, *erb_unless_node->then_keyword);
+  } else {
+    napi_get_null(env, &then_keyword);
+  }
+  napi_set_named_property(env, result, "then_keyword", then_keyword);
+
   napi_value statements = NodesArrayFromCArray(env, erb_unless_node->statements);
   napi_set_named_property(env, result, "statements", statements);
 
@@ -1077,6 +1101,14 @@ napi_value erb_in_nodeNodeFromCStruct(napi_env env, AST_ERB_IN_NODE_T* erb_in_no
   napi_value tag_closing = CreateToken(env, erb_in_node->tag_closing);
   napi_set_named_property(env, result, "tag_closing", tag_closing);
 
+  napi_value then_keyword;
+  if (erb_in_node->then_keyword != NULL) {
+    then_keyword = CreateLocation(env, *erb_in_node->then_keyword);
+  } else {
+    napi_get_null(env, &then_keyword);
+  }
+  napi_set_named_property(env, result, "then_keyword", then_keyword);
+
   napi_value statements = NodesArrayFromCArray(env, erb_in_node->statements);
   napi_set_named_property(env, result, "statements", statements);
 

package/extension/nodes.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.7/templates/javascript/packages/node/extension/nodes.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.9/templates/javascript/packages/node/extension/nodes.h.erb
 
 #ifndef HERB_EXTENSION_NODES_H
 #define HERB_EXTENSION_NODES_H

package/extension/prism/include/prism/version.h

@@ -14,7 +14,7 @@
 /**
  * The minor version of the Prism library as an int.
  */
-#define PRISM_VERSION_MINOR 7
+#define PRISM_VERSION_MINOR 8
 
 /**
  * The patch version of the Prism library as an int.
@@ -24,6 +24,6 @@
 /**
  * The version of the Prism library as a constant string.
  */
-#define PRISM_VERSION "1.7.0"
+#define PRISM_VERSION "1.8.0"
 
 #endif