mt-lang 0.3.9 → 0.3.11

data/lib/milk_tea/lsp/server/lifecycle.rb

@@ -4,230 +4,228 @@ module MilkTea
   module LSP
     class Server
       module ServerLifecycle
-        private
-
-      def handle_initialize(params)
-        @pull_diagnostics_active = true
-        if @_initialize_called
-          @_indexing_thread&.join rescue nil
-          @_indexing_thread = nil
-          @workspace.reset
-          @format_mode = :tidy
-          @dependency_resolution_mode = :auto
-          @platform_override = nil
-          @diagnostic_report_cache.clear
-          @workspace_diagnostic_cache.clear
-          drain_diagnostics_queue
-          @diagnostics_pending.clear
-          @diagnostics_enqueued.clear
-          @diagnostics_last_scheduled_hash.clear
-          @diagnostics_generation.clear
-          @semantic_tokens_cache.clear
-          @semantic_tokens_delta_cache.clear
-          @fixall_cache.clear
-          @definition_file_token_cache.clear
-          @definition_file_ast_cache.clear
-          MilkTea::Types::Registry.reset!
-        end
-        @_initialize_called = true
-        @root_uri = params['rootUri']
-        @client_capabilities = params['capabilities'] || {}
-        @workspace.workspace_root_path = uri_to_path(@root_uri)
-        negotiate_position_encoding(params)
-        apply_configuration_settings(params['initializationOptions'])
-        apply_configuration_settings(params['settings'])
-        {
-          capabilities: {
-            positionEncoding: @position_encoding,
-            textDocumentSync: {
-              openClose: true,
-              change: 2,
-              save: { includeText: true },
-              willSaveWaitUntil: true
-            },
-            hoverProvider: true,
-            definitionProvider: true,
-            declarationProvider: true,
-            typeDefinitionProvider: true,
-            implementationProvider: true,
-            referencesProvider: true,
-            documentLinkProvider: {
-              resolveProvider: true
-            },
-            documentHighlightProvider: true,
-            documentSymbolProvider: true,
-            documentFormattingProvider: true,
-            documentRangeFormattingProvider: true,
-            foldingRangeProvider: true,
-            callHierarchyProvider: true,
-            typeHierarchyProvider: true,
-            selectionRangeProvider: true,
-            linkedEditingRangeProvider: true,
-            executeCommandProvider: {
-              commands: ['mtc.restartServer']
-            },
-            documentOnTypeFormattingProvider: {
-              firstTriggerCharacter: "\n",
-              moreTriggerCharacter: []
-            },
-            signatureHelpProvider: {
-              triggerCharacters: ['(', ','],
-              retriggerCharacters: [',']
-            },
-            codeActionProvider: {
-              codeActionKinds: ['quickFix', 'source.fixAll']
-            },
-            codeLensProvider: {
-              resolveProvider: true
-            },
-            inlayHintProvider: true,
-            semanticTokensProvider: {
-              legend: {
-                tokenTypes: SEMANTIC_TOKEN_TYPES,
-                tokenModifiers: SEMANTIC_TOKEN_MODIFIERS
+        def handle_initialize(params)
+          @pull_diagnostics_active = true
+          if @_initialize_called
+            @_indexing_thread&.join rescue nil
+            @_indexing_thread = nil
+            @workspace.reset
+            @format_mode = :tidy
+            @dependency_resolution_mode = :auto
+            @platform_override = nil
+            @diagnostic_report_cache.clear
+            @workspace_diagnostic_cache.clear
+            drain_diagnostics_queue
+            @diagnostics_pending.clear
+            @diagnostics_enqueued.clear
+            @diagnostics_last_scheduled_hash.clear
+            @diagnostics_generation.clear
+            @semantic_tokens_cache.clear
+            @semantic_tokens_delta_cache.clear
+            @fixall_cache.clear
+            @definition_file_token_cache.clear
+            @definition_file_ast_cache.clear
+            MilkTea::Types::Registry.reset!
+          end
+          @_initialize_called = true
+          @root_uri = params['rootUri']
+          @client_capabilities = params['capabilities'] || {}
+          @workspace.workspace_root_path = uri_to_path(@root_uri)
+          negotiate_position_encoding(params)
+          apply_configuration_settings(params['initializationOptions'])
+          apply_configuration_settings(params['settings'])
+          {
+            capabilities: {
+              positionEncoding: @position_encoding,
+              textDocumentSync: {
+                openClose: true,
+                change: 2,
+                save: { includeText: true },
+                willSaveWaitUntil: true
               },
-              full: { delta: true },
-              range: true
-            },
-            completionProvider: {
-              triggerCharacters: ['.', '(', ' '],
-              resolveProvider: true
-            },
-            renameProvider: { prepareProvider: true },
-            workspaceSymbolProvider: true,
-            diagnosticProvider: {
-              interFileDependencies: true,
-              workspaceDiagnostics: true
-            },
-            workspace: {
-              workspaceFolders: {
-                supported: true,
-                changeNotifications: true,
+              hoverProvider: true,
+              definitionProvider: true,
+              declarationProvider: true,
+              typeDefinitionProvider: true,
+              implementationProvider: true,
+              referencesProvider: true,
+              documentLinkProvider: {
+                resolveProvider: true
               },
-              fileOperations: {
-                willRename: {
-                  filters: [{ pattern: { glob: '**/*.mt' }, scheme: 'file' }]
-                }
+              documentHighlightProvider: true,
+              documentSymbolProvider: true,
+              documentFormattingProvider: true,
+              documentRangeFormattingProvider: true,
+              foldingRangeProvider: true,
+              callHierarchyProvider: true,
+              typeHierarchyProvider: true,
+              selectionRangeProvider: true,
+              linkedEditingRangeProvider: true,
+              executeCommandProvider: {
+                commands: ['mtc.restartServer']
+              },
+              documentOnTypeFormattingProvider: {
+                firstTriggerCharacter: "\n",
+                moreTriggerCharacter: []
+              },
+              signatureHelpProvider: {
+                triggerCharacters: ['(', ','],
+                retriggerCharacters: [',']
+              },
+              codeActionProvider: {
+                codeActionKinds: ['quickFix', 'source.fixAll']
+              },
+              codeLensProvider: {
+                resolveProvider: true
+              },
+              inlayHintProvider: true,
+              semanticTokensProvider: {
+                legend: {
+                  tokenTypes: SEMANTIC_TOKEN_TYPES,
+                  tokenModifiers: SEMANTIC_TOKEN_MODIFIERS
+                },
+                full: { delta: true },
+                range: true
               },
-              didChangeWatchedFiles: {
-                dynamicRegistration: true
+              completionProvider: {
+                triggerCharacters: ['.', '(', ' '],
+                resolveProvider: true
+              },
+              renameProvider: { prepareProvider: true },
+              workspaceSymbolProvider: true,
+              diagnosticProvider: {
+                interFileDependencies: true,
+                workspaceDiagnostics: true
+              },
+              workspace: {
+                workspaceFolders: {
+                  supported: true,
+                  changeNotifications: true,
+                },
+                fileOperations: {
+                  willRename: {
+                    filters: [{ pattern: { glob: '**/*.mt' }, scheme: 'file' }]
+                  }
+                },
+                didChangeWatchedFiles: {
+                  dynamicRegistration: true
+                }
               }
             }
           }
-        }
-      end
+        end
 
-      def negotiate_position_encoding(params)
-        client_encodings = params.dig('capabilities', 'general', 'positionEncodings')
-        if client_encodings.is_a?(Array)
-          @position_encoding = if client_encodings.include?('utf-8')
-                                 'utf-8'
-                               elsif client_encodings.include?('utf-32')
-                                 'utf-32'
-                               else
-                                 'utf-16'
-                               end
-        else
-          @position_encoding = 'utf-16'
+        def negotiate_position_encoding(params)
+          client_encodings = params.dig('capabilities', 'general', 'positionEncodings')
+          if client_encodings.is_a?(Array)
+            @position_encoding = if client_encodings.include?('utf-8')
+                                  'utf-8'
+                                elsif client_encodings.include?('utf-32')
+                                  'utf-32'
+                                else
+                                  'utf-16'
+                                end
+          else
+            @position_encoding = 'utf-16'
+          end
+          Diagnostics.position_encoding = @position_encoding
         end
-        Diagnostics.position_encoding = @position_encoding
-      end
 
-      def handle_initialized(_params)
-        pull_client_configuration if @client_capabilities&.dig('workspace', 'configuration')
-        return nil unless @root_uri
-
-        @_indexing_thread = Thread.new do
-          progress = create_progress(title: 'Milk Tea LSP: Indexing workspace', message: 'Scanning source files...')
-          @workspace.index_workspace(@root_uri) { |pct, msg| progress.report(percentage: pct, message: msg) }
-          document_count = @workspace.all_documents.length
-          progress.done(message: "#{document_count} document#{document_count == 1 ? '' : 's'} indexed")
-          log_message(:info, "Milk Tea LSP ready — #{document_count} document#{document_count == 1 ? '' : 's'} indexed")
-          refresh_client_semantic_tokens if document_count > 0
+        def handle_initialized(_params)
+          pull_client_configuration if @client_capabilities&.dig('workspace', 'configuration')
+          return nil unless @root_uri
+
+          @_indexing_thread = Thread.new do
+            progress = create_progress(title: 'Milk Tea LSP: Indexing workspace', message: 'Scanning source files...')
+            @workspace.index_workspace(@root_uri) { |pct, msg| progress.report(percentage: pct, message: msg) }
+            document_count = @workspace.all_documents.length
+            progress.done(message: "#{document_count} document#{document_count == 1 ? '' : 's'} indexed")
+            log_message(:info, "Milk Tea LSP ready — #{document_count} document#{document_count == 1 ? '' : 's'} indexed")
+            refresh_client_semantic_tokens if document_count > 0
+          end
+          nil
         end
-        nil
-      end
 
-      def handle_did_change_configuration(params)
-        apply_configuration_settings(params['settings'])
-        nil
-      end
+        def handle_did_change_configuration(params)
+          apply_configuration_settings(params['settings'])
+          nil
+        end
 
-      def handle_cancel_request(params)
-        request_id = params.is_a?(Hash) ? (params['id'] || params[:id]) : nil
-        return nil if request_id.nil?
+        def handle_cancel_request(params)
+          request_id = params.is_a?(Hash) ? (params['id'] || params[:id]) : nil
+          return nil if request_id.nil?
 
-        @cancelled_requests_mutex.synchronize do
-          @cancelled_request_ids << request_id
+          @cancelled_requests_mutex.synchronize do
+            @cancelled_request_ids << request_id
+          end
+          nil
         end
-        nil
-      end
 
-      def handle_did_change_workspace_folders(params)
-        event = params['event'] || {}
-        added = event['added'] || []
-        removed = event['removed'] || []
+        def handle_did_change_workspace_folders(params)
+          event = params['event'] || {}
+          added = event['added'] || []
+          removed = event['removed'] || []
 
-        removed_uris = removed.filter_map { |folder| folder.is_a?(Hash) ? folder['uri'] : nil }
-        added_uris = added.filter_map { |folder| folder.is_a?(Hash) ? folder['uri'] : nil }
+          removed_uris = removed.filter_map { |folder| folder.is_a?(Hash) ? folder['uri'] : nil }
+          added_uris = added.filter_map { |folder| folder.is_a?(Hash) ? folder['uri'] : nil }
 
-        if removed_uris.include?(@root_uri)
-          @root_uri = added_uris.first
-        elsif @root_uri.nil?
-          @root_uri = added_uris.first
-        end
+          if removed_uris.include?(@root_uri)
+            @root_uri = added_uris.first
+          elsif @root_uri.nil?
+            @root_uri = added_uris.first
+          end
 
-        @workspace.workspace_root_path = uri_to_path(@root_uri)
-        return nil unless @root_uri
+          @workspace.workspace_root_path = uri_to_path(@root_uri)
+          return nil unless @root_uri
 
-        uris = @workspace.open_document_uris.dup
-        Thread.new do
-          progress = create_progress(title: 'Milk Tea LSP: Reindexing workspace', message: 'Scanning source files...')
-          @workspace.index_workspace(@root_uri) { |pct, msg| progress.report(percentage: pct, message: msg) }
-          doc_count = @workspace.all_documents.length
-          progress.done(message: "#{doc_count} document#{doc_count == 1 ? '' : 's'} indexed")
+          uris = @workspace.open_document_uris.dup
+          Thread.new do
+            progress = create_progress(title: 'Milk Tea LSP: Reindexing workspace', message: 'Scanning source files...')
+            @workspace.index_workspace(@root_uri) { |pct, msg| progress.report(percentage: pct, message: msg) }
+            doc_count = @workspace.all_documents.length
+            progress.done(message: "#{doc_count} document#{doc_count == 1 ? '' : 's'} indexed")
 
-          uris.each do |uri|
-            schedule_diagnostics(uri, force: true, lint_tier: :full) unless @workspace.background_document?(uri)
+            uris.each do |uri|
+              schedule_diagnostics(uri, force: true, lint_tier: :full) unless @workspace.background_document?(uri)
+            end
           end
+          nil
         end
-        nil
-      end
 
-      def handle_will_rename_files(params)
-        files = params['files'] || []
-        files.each do |file|
-          old_uri = file['oldUri']
-          new_uri = file['newUri']
-          next unless old_uri && new_uri
+        def handle_will_rename_files(params)
+          files = params['files'] || []
+          files.each do |file|
+            old_uri = file['oldUri']
+            new_uri = file['newUri']
+            next unless old_uri && new_uri
 
-          @workspace.rename_indexed_file(old_uri, new_uri)
+            @workspace.rename_indexed_file(old_uri, new_uri)
+          end
+          nil
         end
-        nil
-      end
 
-      def handle_shutdown(_params)
-        stop_diagnostics_workers
-        @workspace.shutdown
-        nil
-      end
+        def handle_shutdown(_params)
+          stop_diagnostics_workers
+          @workspace.shutdown
+          nil
+        end
 
-      def handle_exit(_params)
-        stop_diagnostics_workers
-        @workspace.shutdown
-        exit(0)
-      end
+        def handle_exit(_params)
+          stop_diagnostics_workers
+          @workspace.shutdown
+          exit(0)
+        end
 
-      SEMANTIC_TOKENS_REFRESH_THROTTLE_MS = 500
+        SEMANTIC_TOKENS_REFRESH_THROTTLE_MS = 500
 
-      def refresh_client_semantic_tokens
-        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        @semantic_tokens_last_refresh ||= 0.0
-        return if (now - @semantic_tokens_last_refresh) * 1000 < SEMANTIC_TOKENS_REFRESH_THROTTLE_MS
+        def refresh_client_semantic_tokens
+          now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          @semantic_tokens_last_refresh ||= 0.0
+          return if (now - @semantic_tokens_last_refresh) * 1000 < SEMANTIC_TOKENS_REFRESH_THROTTLE_MS
 
-        @semantic_tokens_last_refresh = now
-        @protocol.write_notification('workspace/semanticTokens/refresh', nil)
-      end
+          @semantic_tokens_last_refresh = now
+          @protocol.write_notification('workspace/semanticTokens/refresh', nil)
+        end
       end
     end
   end

data/lib/milk_tea/lsp/server/linked_editing_range.rb

@@ -4,8 +4,6 @@ module MilkTea
   module LSP
     class Server
       module ServerLinkedEditingRange
-        private
-
         def handle_linked_editing_range(params)
           uri = params.dig("textDocument", "uri")
           lsp_line = params.dig("position", "line")

data/lib/milk_tea/lsp/server/on_type_formatting.rb

@@ -4,8 +4,6 @@ module MilkTea
   module LSP
     class Server
       module ServerOnTypeFormatting
-        private
-
         BLOCK_INTRODUCING_KEYWORDS = %w[function async editable const public
           struct enum flags variant union
           interface if elif else while for match unsafe extending defer when].freeze

data/lib/milk_tea/lsp/server/progress.rb

@@ -4,8 +4,6 @@ module MilkTea
   module LSP
     class Server
       module ServerProgress
-        private
-
         PROGRESS_TOKEN_PREFIX = "mt-lsp-progress"
 
         def create_progress(title:, message: nil, cancellable: false)