Repairs unknown encoding errors (#936)

castwide · web-flow · commit 25decb9ffa2c · 2025-05-17T00:12:30.000-04:00
diff --git a/lib/solargraph/api_map/store.rb b/lib/solargraph/api_map/store.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-
 module Solargraph
   class ApiMap
     # Queryable collection of Pins representing a Workspace, gems and the Ruby
diff --git a/lib/solargraph/parser/parser_gem/class_methods.rb b/lib/solargraph/parser/parser_gem/class_methods.rb
@@ -11,13 +11,9 @@ module ClassMethods
         # @param filename [String, nil]
         # @return [Array(Parser::AST::Node, Hash{Integer => String})]
         def parse_with_comments code, filename = nil
-          buffer = ::Parser::Source::Buffer.new(filename, 0)
-          buffer.source = code
-          node = parser.parse(buffer)
+          node = parse(code, filename)
           comments = CommentRipper.new(code, filename, 0).parse
           [node, comments]
-        rescue ::Parser::SyntaxError => e
-          raise Parser::SyntaxError, e.message
         end
 
         # @param code [String]
@@ -28,7 +24,7 @@ def parse code, filename = nil, line = 0
           buffer = ::Parser::Source::Buffer.new(filename, line)
           buffer.source = code
           parser.parse(buffer)
-        rescue ::Parser::SyntaxError => e
+        rescue ::Parser::SyntaxError, ::Parser::UnknownEncodingInMagicComment => e
           raise Parser::SyntaxError, e.message
         end
 
diff --git a/spec/parser_spec.rb b/spec/parser_spec.rb
@@ -3,4 +3,9 @@
     node = Solargraph::Parser.parse('class Foo; end', 'test.rb')
     expect(Solargraph::Parser.is_ast_node?(node)).to be(true)
   end
+
+  it 'raises repairable SyntaxError for unknown encoding errors' do
+    code = "# encoding: utf-\nx = 'y'"
+    expect { Solargraph::Parser.parse(code) }.to raise_error(Solargraph::Parser::SyntaxError)
+  end
 end
