From 78bb4b108ed70b72ae48c08b56232579af36b92b Mon Sep 17 00:00:00 2001 From: Glenn Sarti Date: Thu, 16 May 2019 15:18:06 +0800 Subject: [PATCH] (maint) Update for rubocop errors This commit updates Editor Services for the new cops introduced in Rubocop 0.69.0. --- .rubocop.yml | 8 ++++ lib/debugserver/debug_protocol.rb | 2 + lib/lsp/lsp.rb | 2 + lib/lsp/lsp_base.rb | 2 + lib/lsp/lsp_custom.rb | 2 + lib/lsp/lsp_enums.rb | 34 ++++++++------- lib/lsp/lsp_protocol.rb | 2 + lib/lsp/lsp_types.rb | 2 + lib/puppet-debugserver/debug_hook_handlers.rb | 2 + lib/puppet-debugserver/hooks.rb | 2 + lib/puppet-debugserver/json_handler.rb | 2 + lib/puppet-debugserver/message_router.rb | 2 + .../puppet_debug_breakpoints.rb | 2 + .../puppet_debug_session.rb | 2 + .../puppet_monkey_patches.rb | 2 + lib/puppet-editor-services/logging.rb | 2 + lib/puppet-editor-services/simple_base.rb | 2 + .../simple_stdio_server.rb | 2 + .../simple_tcp_server.rb | 2 + lib/puppet-editor-services/version.rb | 4 +- .../cache/base.rb | 8 ++-- .../cache/filesystem.rb | 2 + .../cache/null.rb | 2 + .../puppet_environment_monkey_patches.rb | 2 + .../puppet_helper.rb | 4 +- .../puppet_modulepath_monkey_patches.rb | 2 + .../puppet_monkey_patches.rb | 2 + .../puppet_parser_helper.rb | 2 + .../sidecar_protocol_extensions.rb | 2 + .../workspace.rb | 2 + lib/puppet-languageserver/crash_dump.rb | 2 + lib/puppet-languageserver/document_store.rb | 2 + .../epp/validation_provider.rb | 2 + lib/puppet-languageserver/facter_helper.rb | 2 + lib/puppet-languageserver/json_rpc_handler.rb | 42 ++++++++++--------- .../manifest/completion_provider.rb | 2 + .../manifest/definition_provider.rb | 2 + .../manifest/document_symbol_provider.rb | 2 + .../manifest/hover_provider.rb | 2 + .../manifest/validation_provider.rb | 2 + lib/puppet-languageserver/message_router.rb | 2 + lib/puppet-languageserver/providers.rb | 2 + lib/puppet-languageserver/puppet_helper.rb | 2 + .../puppet_helper/cache.rb | 2 + .../puppet_helper/cache_objects.rb | 2 + .../puppet_monkey_patches.rb | 2 + .../puppet_parser_helper.rb | 2 + .../puppetfile/r10k/module/base.rb | 2 + .../puppetfile/r10k/module/forge.rb | 8 ++-- .../puppetfile/r10k/module/git.rb | 2 + .../puppetfile/r10k/module/invalid.rb | 2 + .../puppetfile/r10k/module/local.rb | 2 + .../puppetfile/r10k/module/svn.rb | 2 + .../puppetfile/r10k/puppetfile.rb | 4 +- .../puppetfile/validation_provider.rb | 2 + .../server_capabilities.rb | 2 + lib/puppet-languageserver/sidecar_protocol.rb | 2 + lib/puppet-languageserver/sidecar_queue.rb | 2 + lib/puppet-languageserver/uri_helper.rb | 2 + lib/puppet-languageserver/validation_queue.rb | 2 + lib/puppet_debugserver.rb | 2 + lib/puppet_editor_services.rb | 2 + lib/puppet_languageserver.rb | 2 + lib/puppet_languageserver_sidecar.rb | 2 + puppet-debugserver | 1 + puppet-languageserver | 1 + puppet-languageserver-sidecar | 1 + 67 files changed, 182 insertions(+), 45 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index fa043b0e..67c875eb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -83,3 +83,11 @@ Layout/AlignHash: Naming/RescuedExceptionsVariableName: PreferredName: e + +# There's no benefit to this and can make things harder to read. +Style/NumericPredicate: + Enabled: false + +# This is not valid on Ruby 2.1 +Style/SafeNavigation: + Enabled: false \ No newline at end of file diff --git a/lib/debugserver/debug_protocol.rb b/lib/debugserver/debug_protocol.rb index 6f1e20c7..e3c7f432 100644 --- a/lib/debugserver/debug_protocol.rb +++ b/lib/debugserver/debug_protocol.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Original JSON Schema for the protocol # https://github.com/Microsoft/vscode-debugadapter-node/blob/master/debugProtocol.json # diff --git a/lib/lsp/lsp.rb b/lib/lsp/lsp.rb index 85dc02df..0a412cf4 100644 --- a/lib/lsp/lsp.rb +++ b/lib/lsp/lsp.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + %w[lsp_base lsp_enums lsp_protocol lsp_types lsp_custom].each do |lib| begin require "lsp/#{lib}" diff --git a/lib/lsp/lsp_base.rb b/lib/lsp/lsp_base.rb index b2e08d58..dfe26213 100644 --- a/lib/lsp/lsp_base.rb +++ b/lib/lsp/lsp_base.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'json' module LSP diff --git a/lib/lsp/lsp_custom.rb b/lib/lsp/lsp_custom.rb index f878be42..1a654861 100644 --- a/lib/lsp/lsp_custom.rb +++ b/lib/lsp/lsp_custom.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Custom LSP Messages module LSP diff --git a/lib/lsp/lsp_enums.rb b/lib/lsp/lsp_enums.rb index 33f1be58..3dc0473a 100644 --- a/lib/lsp/lsp_enums.rb +++ b/lib/lsp/lsp_enums.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # DO NOT MODIFY. This file is built automatically # LSP Enumerations @@ -14,8 +16,8 @@ module DiagnosticSeverity end module MarkupKind - PLAINTEXT = 'plaintext'.freeze - MARKDOWN = 'markdown'.freeze + PLAINTEXT = 'plaintext' + MARKDOWN = 'markdown' end module CompletionItemKind @@ -87,13 +89,13 @@ module SymbolKind end module CodeActionKind - QUICKFIX = 'quickfix'.freeze - REFACTOR = 'refactor'.freeze - REFACTOREXTRACT = 'refactor.extract'.freeze - REFACTORINLINE = 'refactor.inline'.freeze - REFACTORREWRITE = 'refactor.rewrite'.freeze - SOURCE = 'source'.freeze - SOURCEORGANIZEIMPORTS = 'source.organizeImports'.freeze + QUICKFIX = 'quickfix' + REFACTOR = 'refactor' + REFACTOREXTRACT = 'refactor.extract' + REFACTORINLINE = 'refactor.inline' + REFACTORREWRITE = 'refactor.rewrite' + SOURCE = 'source' + SOURCEORGANIZEIMPORTS = 'source.organizeImports' end module TextDocumentSaveReason @@ -103,16 +105,16 @@ module TextDocumentSaveReason end module ResourceOperationKind - CREATE = 'create'.freeze - RENAME = 'rename'.freeze - DELETE = 'delete'.freeze + CREATE = 'create' + RENAME = 'rename' + DELETE = 'delete' end module FailureHandlingKind - ABORT = 'abort'.freeze - TRANSACTIONAL = 'transactional'.freeze - TEXTONLYTRANSACTIONAL = 'textOnlyTransactional'.freeze - UNDO = 'undo'.freeze + ABORT = 'abort' + TRANSACTIONAL = 'transactional' + TEXTONLYTRANSACTIONAL = 'textOnlyTransactional' + UNDO = 'undo' end module TextDocumentSyncKind diff --git a/lib/lsp/lsp_protocol.rb b/lib/lsp/lsp_protocol.rb index 13ec617a..460096cc 100644 --- a/lib/lsp/lsp_protocol.rb +++ b/lib/lsp/lsp_protocol.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # DO NOT MODIFY. This file is built automatically # LSP Protocol: vscode-languageserver-protocol/lib/protocol.d.ts diff --git a/lib/lsp/lsp_types.rb b/lib/lsp/lsp_types.rb index de19c916..b7294443 100644 --- a/lib/lsp/lsp_types.rb +++ b/lib/lsp/lsp_types.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # DO NOT MODIFY. This file is built automatically # LSP Protocol: vscode-languageserver-types/lib/esm/main.d.ts diff --git a/lib/puppet-debugserver/debug_hook_handlers.rb b/lib/puppet-debugserver/debug_hook_handlers.rb index 44a07f13..f99e672d 100644 --- a/lib/puppet-debugserver/debug_hook_handlers.rb +++ b/lib/puppet-debugserver/debug_hook_handlers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetDebugServer module PuppetDebugSession @hook_handler = nil diff --git a/lib/puppet-debugserver/hooks.rb b/lib/puppet-debugserver/hooks.rb index 44f62f1d..72018207 100644 --- a/lib/puppet-debugserver/hooks.rb +++ b/lib/puppet-debugserver/hooks.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetDebugServer # This code was inspired from Puppet-Debugger (https://raw.githubusercontent.com/nwops/puppet-debugger/master/lib/puppet-debugger/hooks.rb) which was borrowed from Pry hooks file diff --git a/lib/puppet-debugserver/json_handler.rb b/lib/puppet-debugserver/json_handler.rb index bb993f09..4937433f 100644 --- a/lib/puppet-debugserver/json_handler.rb +++ b/lib/puppet-debugserver/json_handler.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'json' # Full debug protocol diff --git a/lib/puppet-debugserver/message_router.rb b/lib/puppet-debugserver/message_router.rb index 50fe51cb..5dedb736 100644 --- a/lib/puppet-debugserver/message_router.rb +++ b/lib/puppet-debugserver/message_router.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetDebugServer class MessageRouter attr_accessor :json_handler diff --git a/lib/puppet-debugserver/puppet_debug_breakpoints.rb b/lib/puppet-debugserver/puppet_debug_breakpoints.rb index 8c4c1326..97d3737e 100644 --- a/lib/puppet-debugserver/puppet_debug_breakpoints.rb +++ b/lib/puppet-debugserver/puppet_debug_breakpoints.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetDebugServer module PuppetDebugSession @session_function_breakpoints = [] diff --git a/lib/puppet-debugserver/puppet_debug_session.rb b/lib/puppet-debugserver/puppet_debug_session.rb index 064a5bdf..b80ea32c 100644 --- a/lib/puppet-debugserver/puppet_debug_session.rb +++ b/lib/puppet-debugserver/puppet_debug_session.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetDebugServer module PuppetDebugSession @connection = nil diff --git a/lib/puppet-debugserver/puppet_monkey_patches.rb b/lib/puppet-debugserver/puppet_monkey_patches.rb index f06ae8bc..2e42ce30 100644 --- a/lib/puppet-debugserver/puppet_monkey_patches.rb +++ b/lib/puppet-debugserver/puppet_monkey_patches.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Monkey patch the Apply application (puppet apply) so that we route the exit # statement into the debugger first and then exit the puppet thread require 'puppet/application/apply' diff --git a/lib/puppet-editor-services/logging.rb b/lib/puppet-editor-services/logging.rb index 51cf4b5e..c3d1d3c5 100644 --- a/lib/puppet-editor-services/logging.rb +++ b/lib/puppet-editor-services/logging.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetEditorServices def self.log_message(severity, message) return if @logger.nil? diff --git a/lib/puppet-editor-services/simple_base.rb b/lib/puppet-editor-services/simple_base.rb index 4fbfeef1..474af337 100644 --- a/lib/puppet-editor-services/simple_base.rb +++ b/lib/puppet-editor-services/simple_base.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetEditorServices class SimpleServerConnectionBase # Override this method diff --git a/lib/puppet-editor-services/simple_stdio_server.rb b/lib/puppet-editor-services/simple_stdio_server.rb index 19b746c2..1677ca93 100644 --- a/lib/puppet-editor-services/simple_stdio_server.rb +++ b/lib/puppet-editor-services/simple_stdio_server.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetEditorServices class SimpleSTDIOServerConnection < SimpleServerConnectionBase attr_accessor :simple_stdio_server diff --git a/lib/puppet-editor-services/simple_tcp_server.rb b/lib/puppet-editor-services/simple_tcp_server.rb index 43de4111..206cd5db 100644 --- a/lib/puppet-editor-services/simple_tcp_server.rb +++ b/lib/puppet-editor-services/simple_tcp_server.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'socket' # Based on code from diff --git a/lib/puppet-editor-services/version.rb b/lib/puppet-editor-services/version.rb index b6afd3f2..9d9671f6 100644 --- a/lib/puppet-editor-services/version.rb +++ b/lib/puppet-editor-services/version.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + module PuppetEditorServices - PUPPETEDITORSERVICESVERSION = '0.19.0'.freeze unless defined? PUPPETEDITORSERVICESVERSION + PUPPETEDITORSERVICESVERSION = '0.19.0' unless defined? PUPPETEDITORSERVICESVERSION # @api public # diff --git a/lib/puppet-languageserver-sidecar/cache/base.rb b/lib/puppet-languageserver-sidecar/cache/base.rb index 06c9d5c8..65246cd6 100644 --- a/lib/puppet-languageserver-sidecar/cache/base.rb +++ b/lib/puppet-languageserver-sidecar/cache/base.rb @@ -1,8 +1,10 @@ +# frozen_string_literal: true + module PuppetLanguageServerSidecar module Cache - CLASSES_SECTION = 'classes'.freeze - FUNCTIONS_SECTION = 'functions'.freeze - TYPES_SECTION = 'types'.freeze + CLASSES_SECTION = 'classes' + FUNCTIONS_SECTION = 'functions' + TYPES_SECTION = 'types' class Base attr_reader :cache_options diff --git a/lib/puppet-languageserver-sidecar/cache/filesystem.rb b/lib/puppet-languageserver-sidecar/cache/filesystem.rb index a8d0a478..128141b0 100644 --- a/lib/puppet-languageserver-sidecar/cache/filesystem.rb +++ b/lib/puppet-languageserver-sidecar/cache/filesystem.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServerSidecar module Cache class FileSystem < Base diff --git a/lib/puppet-languageserver-sidecar/cache/null.rb b/lib/puppet-languageserver-sidecar/cache/null.rb index 7343cf93..e4a0cec6 100644 --- a/lib/puppet-languageserver-sidecar/cache/null.rb +++ b/lib/puppet-languageserver-sidecar/cache/null.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServerSidecar module Cache class Null < Base diff --git a/lib/puppet-languageserver-sidecar/puppet_environment_monkey_patches.rb b/lib/puppet-languageserver-sidecar/puppet_environment_monkey_patches.rb index e7373c0b..d9e70eec 100644 --- a/lib/puppet-languageserver-sidecar/puppet_environment_monkey_patches.rb +++ b/lib/puppet-languageserver-sidecar/puppet_environment_monkey_patches.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Puppet::Environments # rubocop:disable Style/ClassAndModuleChildren class Directories # Monkey patch the environment loader. When it attempts to load the special sidecar diff --git a/lib/puppet-languageserver-sidecar/puppet_helper.rb b/lib/puppet-languageserver-sidecar/puppet_helper.rb index 06daafca..4c16f401 100644 --- a/lib/puppet-languageserver-sidecar/puppet_helper.rb +++ b/lib/puppet-languageserver-sidecar/puppet_helper.rb @@ -1,8 +1,10 @@ +# frozen_string_literal: true + require 'puppet/indirector/face' module PuppetLanguageServerSidecar module PuppetHelper - SIDECAR_PUPPET_ENVIRONMENT = 'sidecarenvironment'.freeze + SIDECAR_PUPPET_ENVIRONMENT = 'sidecarenvironment' def self.path_has_child?(path, child) # Doesn't matter what the child is, if the path is nil it's true. diff --git a/lib/puppet-languageserver-sidecar/puppet_modulepath_monkey_patches.rb b/lib/puppet-languageserver-sidecar/puppet_modulepath_monkey_patches.rb index ee8f7077..56c121b6 100644 --- a/lib/puppet-languageserver-sidecar/puppet_modulepath_monkey_patches.rb +++ b/lib/puppet-languageserver-sidecar/puppet_modulepath_monkey_patches.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Inject the workspace libdir on the fly require 'puppet/util/autoload' module Puppet diff --git a/lib/puppet-languageserver-sidecar/puppet_monkey_patches.rb b/lib/puppet-languageserver-sidecar/puppet_monkey_patches.rb index bf48e828..f082ff78 100644 --- a/lib/puppet-languageserver-sidecar/puppet_monkey_patches.rb +++ b/lib/puppet-languageserver-sidecar/puppet_monkey_patches.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Monkey Patch 3.x functions so where know where they were loaded from require 'puppet/parser/functions' module Puppet diff --git a/lib/puppet-languageserver-sidecar/puppet_parser_helper.rb b/lib/puppet-languageserver-sidecar/puppet_parser_helper.rb index 108d1c0a..d4647075 100644 --- a/lib/puppet-languageserver-sidecar/puppet_parser_helper.rb +++ b/lib/puppet-languageserver-sidecar/puppet_parser_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServerSidecar module PuppetParserHelper def self.compile_node_graph(content) diff --git a/lib/puppet-languageserver-sidecar/sidecar_protocol_extensions.rb b/lib/puppet-languageserver-sidecar/sidecar_protocol_extensions.rb index 974e2ab1..e546ccc6 100644 --- a/lib/puppet-languageserver-sidecar/sidecar_protocol_extensions.rb +++ b/lib/puppet-languageserver-sidecar/sidecar_protocol_extensions.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'puppet-languageserver/sidecar_protocol' module PuppetLanguageServerSidecar diff --git a/lib/puppet-languageserver-sidecar/workspace.rb b/lib/puppet-languageserver-sidecar/workspace.rb index a8b2c91f..cd094e12 100644 --- a/lib/puppet-languageserver-sidecar/workspace.rb +++ b/lib/puppet-languageserver-sidecar/workspace.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServerSidecar module Workspace @root_path = nil diff --git a/lib/puppet-languageserver/crash_dump.rb b/lib/puppet-languageserver/crash_dump.rb index 37294c4c..99eb2712 100644 --- a/lib/puppet-languageserver/crash_dump.rb +++ b/lib/puppet-languageserver/crash_dump.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module CrashDump def self.default_crash_file diff --git a/lib/puppet-languageserver/document_store.rb b/lib/puppet-languageserver/document_store.rb index 59d29d4d..cc08e4a1 100644 --- a/lib/puppet-languageserver/document_store.rb +++ b/lib/puppet-languageserver/document_store.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module DocumentStore @documents = {} diff --git a/lib/puppet-languageserver/epp/validation_provider.rb b/lib/puppet-languageserver/epp/validation_provider.rb index 4e8328f7..04baf43a 100644 --- a/lib/puppet-languageserver/epp/validation_provider.rb +++ b/lib/puppet-languageserver/epp/validation_provider.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Epp module ValidationProvider diff --git a/lib/puppet-languageserver/facter_helper.rb b/lib/puppet-languageserver/facter_helper.rb index 1d9872d9..76c555b9 100644 --- a/lib/puppet-languageserver/facter_helper.rb +++ b/lib/puppet-languageserver/facter_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module FacterHelper @ops_lock = Mutex.new diff --git a/lib/puppet-languageserver/json_rpc_handler.rb b/lib/puppet-languageserver/json_rpc_handler.rb index c1f67c09..821c5029 100644 --- a/lib/puppet-languageserver/json_rpc_handler.rb +++ b/lib/puppet-languageserver/json_rpc_handler.rb @@ -1,41 +1,43 @@ +# frozen_string_literal: true + require 'json' module PuppetLanguageServer CODE_INVALID_JSON = -32700 - MSG_INVALID_JSON = 'invalid JSON'.freeze + MSG_INVALID_JSON = 'invalid JSON' CODE_INVALID_REQUEST = -32600 - MSG_INVALID_REQ_JSONRPC = "invalid request: doesn't include \"jsonrpc\": \"2.0\"".freeze - MSG_INVALID_REQ_ID = 'invalid request: wrong id'.freeze - MSG_INVALID_REQ_METHOD = 'invalid request: wrong method'.freeze - MSG_INVALID_REQ_PARAMS = 'invalid request: wrong params'.freeze + MSG_INVALID_REQ_JSONRPC = "invalid request: doesn't include \"jsonrpc\": \"2.0\"" + MSG_INVALID_REQ_ID = 'invalid request: wrong id' + MSG_INVALID_REQ_METHOD = 'invalid request: wrong method' + MSG_INVALID_REQ_PARAMS = 'invalid request: wrong params' CODE_METHOD_NOT_FOUND = -32601 - MSG_METHOD_NOT_FOUND = 'method not found'.freeze + MSG_METHOD_NOT_FOUND = 'method not found' CODE_INVALID_PARAMS = -32602 - MSG_INVALID_PARAMS = 'invalid parameter(s)'.freeze + MSG_INVALID_PARAMS = 'invalid parameter(s)' CODE_INTERNAL_ERROR = -32603 - MSG_INTERNAL_ERROR = 'internal error'.freeze + MSG_INTERNAL_ERROR = 'internal error' PARSING_ERROR_RESPONSE = '{"jsonrpc":"2.0","id":null,"error":{' \ "\"code\":#{CODE_INVALID_JSON}," \ - "\"message\":\"#{MSG_INVALID_JSON}\"}}".freeze + "\"message\":\"#{MSG_INVALID_JSON}\"}}" BATCH_NOT_SUPPORTED_RESPONSE = '{"jsonrpc":"2.0","id":null,"error":{' \ '"code":-32099,' \ - '"message":"batch mode not implemented"}}'.freeze - - KEY_JSONRPC = 'jsonrpc'.freeze - VALUE_VERSION = '2.0'.freeze - KEY_ID = 'id'.freeze - KEY_METHOD = 'method'.freeze - KEY_PARAMS = 'params'.freeze - KEY_RESULT = 'result'.freeze - KEY_ERROR = 'error'.freeze - KEY_CODE = 'code'.freeze - KEY_MESSAGE = 'message'.freeze + '"message":"batch mode not implemented"}}' + + KEY_JSONRPC = 'jsonrpc' + VALUE_VERSION = '2.0' + KEY_ID = 'id' + KEY_METHOD = 'method' + KEY_PARAMS = 'params' + KEY_RESULT = 'result' + KEY_ERROR = 'error' + KEY_CODE = 'code' + KEY_MESSAGE = 'message' class JSONRPCHandler < PuppetEditorServices::SimpleServerConnectionHandler attr_accessor :message_router diff --git a/lib/puppet-languageserver/manifest/completion_provider.rb b/lib/puppet-languageserver/manifest/completion_provider.rb index 6408b373..75e4fc10 100644 --- a/lib/puppet-languageserver/manifest/completion_provider.rb +++ b/lib/puppet-languageserver/manifest/completion_provider.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Manifest module CompletionProvider diff --git a/lib/puppet-languageserver/manifest/definition_provider.rb b/lib/puppet-languageserver/manifest/definition_provider.rb index 03b1af05..bb9e9916 100644 --- a/lib/puppet-languageserver/manifest/definition_provider.rb +++ b/lib/puppet-languageserver/manifest/definition_provider.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Manifest module DefinitionProvider diff --git a/lib/puppet-languageserver/manifest/document_symbol_provider.rb b/lib/puppet-languageserver/manifest/document_symbol_provider.rb index d75fc40c..7c3fe8cf 100644 --- a/lib/puppet-languageserver/manifest/document_symbol_provider.rb +++ b/lib/puppet-languageserver/manifest/document_symbol_provider.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Manifest module DocumentSymbolProvider diff --git a/lib/puppet-languageserver/manifest/hover_provider.rb b/lib/puppet-languageserver/manifest/hover_provider.rb index c157172c..2d5019c9 100644 --- a/lib/puppet-languageserver/manifest/hover_provider.rb +++ b/lib/puppet-languageserver/manifest/hover_provider.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Manifest module HoverProvider diff --git a/lib/puppet-languageserver/manifest/validation_provider.rb b/lib/puppet-languageserver/manifest/validation_provider.rb index fb1fe763..cb7d4959 100644 --- a/lib/puppet-languageserver/manifest/validation_provider.rb +++ b/lib/puppet-languageserver/manifest/validation_provider.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'puppet-lint' module PuppetLanguageServer module Manifest diff --git a/lib/puppet-languageserver/message_router.rb b/lib/puppet-languageserver/message_router.rb index ff5adb71..1a467e90 100644 --- a/lib/puppet-languageserver/message_router.rb +++ b/lib/puppet-languageserver/message_router.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer class MessageRouter attr_reader :server_options diff --git a/lib/puppet-languageserver/providers.rb b/lib/puppet-languageserver/providers.rb index 9c88636c..1fd99e1b 100644 --- a/lib/puppet-languageserver/providers.rb +++ b/lib/puppet-languageserver/providers.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + %w[ epp/validation_provider manifest/completion_provider diff --git a/lib/puppet-languageserver/puppet_helper.rb b/lib/puppet-languageserver/puppet_helper.rb index d7f3d4f4..67d987f6 100644 --- a/lib/puppet-languageserver/puppet_helper.rb +++ b/lib/puppet-languageserver/puppet_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'pathname' require 'tempfile' diff --git a/lib/puppet-languageserver/puppet_helper/cache.rb b/lib/puppet-languageserver/puppet_helper/cache.rb index 6834be1f..7c478b2f 100644 --- a/lib/puppet-languageserver/puppet_helper/cache.rb +++ b/lib/puppet-languageserver/puppet_helper/cache.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module PuppetHelper class Cache diff --git a/lib/puppet-languageserver/puppet_helper/cache_objects.rb b/lib/puppet-languageserver/puppet_helper/cache_objects.rb index ef3b3891..8897d393 100644 --- a/lib/puppet-languageserver/puppet_helper/cache_objects.rb +++ b/lib/puppet-languageserver/puppet_helper/cache_objects.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module PuppetHelper # key => Unique name of the object diff --git a/lib/puppet-languageserver/puppet_monkey_patches.rb b/lib/puppet-languageserver/puppet_monkey_patches.rb index ce6b9a0f..58c1e687 100644 --- a/lib/puppet-languageserver/puppet_monkey_patches.rb +++ b/lib/puppet-languageserver/puppet_monkey_patches.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Monkey Patch the Puppet language parser so we can globally lock any changes to the # global setting Puppet[:tasks]. We need to manage this so we can switch between # parsing modes. Unfortunately we can't do this as method parameter, only via the diff --git a/lib/puppet-languageserver/puppet_parser_helper.rb b/lib/puppet-languageserver/puppet_parser_helper.rb index e9132817..a31e076f 100644 --- a/lib/puppet-languageserver/puppet_parser_helper.rb +++ b/lib/puppet-languageserver/puppet_parser_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module PuppetParserHelper def self.remove_chars_starting_at(content, line_offsets, line_num, char_num, num_chars_to_remove) diff --git a/lib/puppet-languageserver/puppetfile/r10k/module/base.rb b/lib/puppet-languageserver/puppetfile/r10k/module/base.rb index 55ecbed2..13da78d6 100644 --- a/lib/puppet-languageserver/puppetfile/r10k/module/base.rb +++ b/lib/puppet-languageserver/puppetfile/r10k/module/base.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Puppetfile module R10K diff --git a/lib/puppet-languageserver/puppetfile/r10k/module/forge.rb b/lib/puppet-languageserver/puppetfile/r10k/module/forge.rb index 60fe7ce5..9b551e6c 100644 --- a/lib/puppet-languageserver/puppetfile/r10k/module/forge.rb +++ b/lib/puppet-languageserver/puppetfile/r10k/module/forge.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Puppetfile module R10K @@ -20,9 +22,9 @@ def properties # Version string matching regexes # From Semantic Puppet gem - REGEX_NUMERIC = '(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)'.freeze # Major . Minor . Patch - REGEX_PRE = '(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?'.freeze # Prerelease - REGEX_BUILD = '(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?'.freeze # Build + REGEX_NUMERIC = '(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)' # Major . Minor . Patch + REGEX_PRE = '(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?' # Prerelease + REGEX_BUILD = '(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?' # Build REGEX_FULL = REGEX_NUMERIC + REGEX_PRE + REGEX_BUILD.freeze REGEX_FULL_RX = /\A#{REGEX_FULL}\Z/.freeze diff --git a/lib/puppet-languageserver/puppetfile/r10k/module/git.rb b/lib/puppet-languageserver/puppetfile/r10k/module/git.rb index 63152b49..aedd9ad1 100644 --- a/lib/puppet-languageserver/puppetfile/r10k/module/git.rb +++ b/lib/puppet-languageserver/puppetfile/r10k/module/git.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Puppetfile module R10K diff --git a/lib/puppet-languageserver/puppetfile/r10k/module/invalid.rb b/lib/puppet-languageserver/puppetfile/r10k/module/invalid.rb index d88d24e2..1a5bf0a2 100644 --- a/lib/puppet-languageserver/puppetfile/r10k/module/invalid.rb +++ b/lib/puppet-languageserver/puppetfile/r10k/module/invalid.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This is a special module definition. It's the catchall when no other module type can handle it module PuppetLanguageServer diff --git a/lib/puppet-languageserver/puppetfile/r10k/module/local.rb b/lib/puppet-languageserver/puppetfile/r10k/module/local.rb index dd52fb4f..7d209c63 100644 --- a/lib/puppet-languageserver/puppetfile/r10k/module/local.rb +++ b/lib/puppet-languageserver/puppetfile/r10k/module/local.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Puppetfile module R10K diff --git a/lib/puppet-languageserver/puppetfile/r10k/module/svn.rb b/lib/puppet-languageserver/puppetfile/r10k/module/svn.rb index 6c4a8f5e..43cda758 100644 --- a/lib/puppet-languageserver/puppetfile/r10k/module/svn.rb +++ b/lib/puppet-languageserver/puppetfile/r10k/module/svn.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Puppetfile module R10K diff --git a/lib/puppet-languageserver/puppetfile/r10k/puppetfile.rb b/lib/puppet-languageserver/puppetfile/r10k/puppetfile.rb index 37cb40c1..afe6611b 100644 --- a/lib/puppet-languageserver/puppetfile/r10k/puppetfile.rb +++ b/lib/puppet-languageserver/puppetfile/r10k/puppetfile.rb @@ -1,7 +1,9 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Puppetfile module R10K - PUPPETFILE_MONIKER ||= 'Puppetfile'.freeze + PUPPETFILE_MONIKER ||= 'Puppetfile' class Puppetfile attr_reader :modules diff --git a/lib/puppet-languageserver/puppetfile/validation_provider.rb b/lib/puppet-languageserver/puppetfile/validation_provider.rb index 25e53fd5..734407c5 100644 --- a/lib/puppet-languageserver/puppetfile/validation_provider.rb +++ b/lib/puppet-languageserver/puppetfile/validation_provider.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Puppetfile module ValidationProvider diff --git a/lib/puppet-languageserver/server_capabilities.rb b/lib/puppet-languageserver/server_capabilities.rb index 86557791..a880667c 100644 --- a/lib/puppet-languageserver/server_capabilities.rb +++ b/lib/puppet-languageserver/server_capabilities.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module ServerCapabilites def self.capabilities diff --git a/lib/puppet-languageserver/sidecar_protocol.rb b/lib/puppet-languageserver/sidecar_protocol.rb index c5c1d47d..6e680370 100644 --- a/lib/puppet-languageserver/sidecar_protocol.rb +++ b/lib/puppet-languageserver/sidecar_protocol.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer module Sidecar module Protocol diff --git a/lib/puppet-languageserver/sidecar_queue.rb b/lib/puppet-languageserver/sidecar_queue.rb index d1d7830c..3888fa9f 100644 --- a/lib/puppet-languageserver/sidecar_queue.rb +++ b/lib/puppet-languageserver/sidecar_queue.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'open3' module PuppetLanguageServer diff --git a/lib/puppet-languageserver/uri_helper.rb b/lib/puppet-languageserver/uri_helper.rb index 09f87977..2e4ab69a 100644 --- a/lib/puppet-languageserver/uri_helper.rb +++ b/lib/puppet-languageserver/uri_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'uri' require 'puppet' diff --git a/lib/puppet-languageserver/validation_queue.rb b/lib/puppet-languageserver/validation_queue.rb index c39e5863..2846da6d 100644 --- a/lib/puppet-languageserver/validation_queue.rb +++ b/lib/puppet-languageserver/validation_queue.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PuppetLanguageServer # Module for enqueing and running document level validation asynchronously # When adding a document to be validation, it will remove any validation requests for the same diff --git a/lib/puppet_debugserver.rb b/lib/puppet_debugserver.rb index 5757487e..68181eaa 100644 --- a/lib/puppet_debugserver.rb +++ b/lib/puppet_debugserver.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'debugserver/debug_protocol' require 'puppet_editor_services' diff --git a/lib/puppet_editor_services.rb b/lib/puppet_editor_services.rb index b65549df..70eca149 100644 --- a/lib/puppet_editor_services.rb +++ b/lib/puppet_editor_services.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + %w[logging version simple_base simple_tcp_server simple_stdio_server].each do |lib| begin require "puppet-editor-services/#{lib}" diff --git a/lib/puppet_languageserver.rb b/lib/puppet_languageserver.rb index f9ec53be..283f29b3 100644 --- a/lib/puppet_languageserver.rb +++ b/lib/puppet_languageserver.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin original_verbose = $VERBOSE $VERBOSE = nil diff --git a/lib/puppet_languageserver_sidecar.rb b/lib/puppet_languageserver_sidecar.rb index 525ccb4f..0564a365 100644 --- a/lib/puppet_languageserver_sidecar.rb +++ b/lib/puppet_languageserver_sidecar.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin original_verbose = $VERBOSE $VERBOSE = nil diff --git a/puppet-debugserver b/puppet-debugserver index b50f5731..56b2113d 100755 --- a/puppet-debugserver +++ b/puppet-debugserver @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true # Add the debug server into the load path $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib')) diff --git a/puppet-languageserver b/puppet-languageserver index eb94e8bf..7759ec98 100755 --- a/puppet-languageserver +++ b/puppet-languageserver @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true # Add the language server into the load path $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib')) diff --git a/puppet-languageserver-sidecar b/puppet-languageserver-sidecar index 69c5caad..e013ba04 100755 --- a/puppet-languageserver-sidecar +++ b/puppet-languageserver-sidecar @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true # Add the language server into the load path $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))