Drop Token#next_token and support comments without preceding space

Author: cjoudrey

lib/graphql/language/lexer.rb

@@ -993,7 +993,6 @@ def self.record_comment(ts, te, meta)
           prev_token: @previous_token,
         )
 
-        @previous_token.next_token = token if @previous_token
         @previous_token = token
 
         meta[:col] += te - ts
@@ -1007,7 +1006,6 @@ def self.emit(token_name, ts, te, meta)
           col: meta[:col],
           prev_token: @previous_token,
         )
-        @previous_token.next_token = token if @previous_token
         @previous_token = token
         # Bump the column counter for the next token
         meta[:col] += te - ts
@@ -1050,7 +1048,6 @@ def self.emit_string(ts, te, meta)
           )
         end
 
-        @previous_token.next_token = token if @previous_token
         @previous_token = token
         meta[:col] += te - ts
       end

lib/graphql/language/lexer.rl

@@ -148,7 +148,6 @@ module GraphQL
           prev_token: @previous_token,
         )
 
-        @previous_token.next_token = token if @previous_token
         @previous_token = token
 
         meta[:col] += te - ts
@@ -162,7 +161,6 @@ module GraphQL
           col: meta[:col],
           prev_token: @previous_token,
         )
-        @previous_token.next_token = token if @previous_token
         @previous_token = token
         # Bump the column counter for the next token
         meta[:col] += te - ts
@@ -205,7 +203,6 @@ module GraphQL
           )
         end
 
-        @previous_token.next_token = token if @previous_token
         @previous_token = token
         meta[:col] += te - ts
       end

lib/graphql/language/parser.rb

@@ -376,18 +376,19 @@ def get_description(token)
   comments = []
 
   loop do
+    prev_token = token
     token = token.prev_token
 
     break if token.nil?
     break if token.name != :COMMENT
-    break if token.next_token.line != token.line + 1
+    break if prev_token.line != token.line + 1
 
-    comments << token.to_s[2..-1] || ""
+    comments.unshift(token.to_s.sub(/^#\s*/, ""))
   end
 
   return nil if comments.empty?
 
-  comments.reverse.join("\n")
+  comments.join("\n")
 end
 
 def on_error(parser_token_id, lexer_token, vstack)

lib/graphql/language/parser.y

@@ -302,7 +302,7 @@ def self.included(test)
                   BLUE
                 }
 
-                # What a great type
+                #Comment without preceding space
                 type Hello {
                   # And a field to boot
                   str: String
@@ -344,7 +344,7 @@ def self.included(test)
 
                 object_type_definition = document.definitions.shift
                 assert_equal GraphQL::Language::Nodes::ObjectTypeDefinition, object_type_definition.class
-                assert_equal 'What a great type', object_type_definition.description
+                assert_equal 'Comment without preceding space', object_type_definition.description
                 assert_equal 'And a field to boot', object_type_definition.fields[0].description
 
                 input_object_type_definition = document.definitions.shift

lib/graphql/language/parser_tests.rb

@@ -5,7 +5,6 @@ module Language
     class Token
       # @return [Symbol] The kind of token this is
       attr_reader :name, :prev_token, :line
-      attr_accessor :next_token
 
       def initialize(value:, name:, line:, col:, prev_token:)
         @name = name

lib/graphql/language/token.rb

@@ -15,10 +15,6 @@
     |}
     let(:tokens) { subject.tokenize(query_string) }
 
-    it "keeps track of next_token" do
-      assert_equal tokens[1], tokens[0].next_token
-    end
-
     it "keeps track of previous_token" do
       assert_equal tokens[0], tokens[1].prev_token
     end