mbeditor 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e34c84c4c7e3a0ef9d4382dd49c29ac3bd13fdc42f8b38d50666cdd30439b6
-  data.tar.gz: 07a9658a8d2faa837969d7c8b05556eaba59afeb48af63b9c8482d7693805b64
+  metadata.gz: cd0837fbeccc3634d7804e6f9957bbbaca06bb4c02942eb4decc5e8b174499ab
+  data.tar.gz: 9f97239369b2968c17cd3909abdced4917329a349564d02ebde6beb89cb8c36f
 SHA512:
-  metadata.gz: 4506a5f5c0e7d7c5b111f9e6cb665cf5d95b7a2e9be5c140948c49f3fbb3a7ee9c13e78d1924d891522131cb85d512242074202298172a10915ea57e6e48f71a
-  data.tar.gz: c7b06da62965639c18f0531a9459da9ddcfeb14ba29ecceadeb600aeec8eb28197657c3dcca4dec5311978fef1397dc610cc2d9f27ead2513ec2e768daceda62
+  metadata.gz: 6310dc010236970bf25c0945a465122e1f8a081c399696d8870dc852d85454153863b01b1f1e9a8871abc3fbe07b1489724a065835c2909daa15426899701833
+  data.tar.gz: f8ed953601769d6785a4fecd4c3b16a6ce820e6e7f5c88a7cb12750d8f32b5122dc6bc25fd67be5e86bd7ef02ae1beba9ece2dbc5fc5bc0324df47785a03c9ba

data/app/assets/javascripts/mbeditor/components/FileTree.js

@@ -12,6 +12,13 @@ var useRef = _React.useRef;
 var useEffect = _React.useEffect;
 var useMemo = _React.useMemo;
 
+function formatSize(bytes) {
+  if (typeof bytes !== 'number' || bytes < 0) return '';
+  if (bytes < 1024)        return bytes + ' B';
+  if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(1) + ' KB';
+  return (bytes / (1024 * 1024)).toFixed(1) + ' MB';
+}
+
 var FileTree = function FileTree(_ref) {
   var items = _ref.items;
   var onSelect = _ref.onSelect;
@@ -477,7 +484,7 @@ var FileTree = function FileTree(_ref) {
           ),
           React.createElement(
             'div',
-            { className: 'tree-item-name', title: node.path },
+            { className: 'tree-item-name', title: node.type === 'file' && node.size != null ? node.path + ' — ' + formatSize(node.size) : node.path },
             node.name
           ),
           statusMeta && React.createElement(

data/app/assets/javascripts/mbeditor/editor_plugins.js

@@ -51,12 +51,16 @@
 
   var globalsRegistered = false;
 
-  // Enumerate window for user-defined (non-native) globals and return a TypeScript
-  // declaration string.  Sprockets exposes every top-level var/function as a window
-  // property before Monaco initialises, so scanning window at registration time
-  // captures components, services, and helpers without any manual listing.
+  // Enumerate window for user-defined globals and return a TypeScript declaration string.
+  // Sprockets exposes every top-level var/function as a window property before Monaco
+  // initialises, so scanning at registration time captures all components and helpers.
+  //
+  // Filter: keep only plain writable data properties (configurable, writable, no getter).
+  // Browser built-ins are either non-configurable or accessor properties (hasGet), so
+  // this reliably separates them from user-assigned globals without a native-code test
+  // (which only works for functions, not objects like `document` or `location`).
   function buildWindowGlobalsShim() {
-    var alreadyDeclared = { React: 1, ReactDOM: 1, PropTypes: 1, MaterialUI: 1 };
+    var alreadyDeclared = { React: 1, ReactDOM: 1, PropTypes: 1, MaterialUI: 1, $: 1, jQuery: 1 };
     var lines = [];
     try {
       var keys = Object.keys(window);
@@ -64,14 +68,12 @@
         var key = keys[i];
         if (alreadyDeclared[key]) continue;
         if (!/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key)) continue;
+        var desc;
+        try { desc = Object.getOwnPropertyDescriptor(window, key); } catch (e) { continue; }
+        if (!desc || !desc.configurable || !desc.writable || desc.get) continue;
         var value;
         try { value = window[key]; } catch (e) { continue; }
         if (value === null || value === undefined) continue;
-        if (typeof value === 'function') {
-          try {
-            if (/\[native code\]/.test(Function.prototype.toString.call(value))) continue;
-          } catch (e) { continue; }
-        }
         lines.push('declare var ' + key + ': any;');
       }
     } catch (e) {}
@@ -322,6 +324,30 @@
         event.stopPropagation();
       });
 
+      // Navigate to a Ruby symbol: modules/classes go to their definition file,
+      // lowercase symbols go to their def line.
+      function navigateToWord(word) {
+        if (/^[A-Z]/.test(word) && typeof FileService !== 'undefined' && FileService.getModuleMembers) {
+          FileService.getModuleMembers(word).then(function(data) {
+            if (!data || !data.file) return;
+            var filename = data.file.split('/').pop();
+            if (typeof TabManager !== 'undefined' && TabManager.openTab) {
+              TabManager.openTab(data.file, filename, 1);
+            }
+          }).catch(function() {});
+          return;
+        }
+        if (typeof FileService === 'undefined' || !FileService.getDefinition) return;
+        FileService.getDefinition(word, 'ruby').then(function(data) {
+          var results = data && Array.isArray(data.results) ? data.results : [];
+          if (results.length === 0) return;
+          var r = results[0];
+          if (typeof TabManager !== 'undefined' && TabManager.openTab) {
+            TabManager.openTab(r.file, r.file.split('/').pop(), r.line);
+          }
+        }).catch(function() {});
+      }
+
       // Ctrl/Cmd+click — navigate to definition
       gotoMouseDisposable = editor.onMouseDown(function(event) {
         var ctrlOrCmd = event.event.ctrlKey || event.event.metaKey;
@@ -336,19 +362,9 @@
         if (!wordInfo || !wordInfo.word || wordInfo.word.length < 2) return;
         if (RUBY_KEYWORDS[wordInfo.word]) return;
         if (RUBY_CORE_METHODS[wordInfo.word]) return;
-        if (typeof FileService === 'undefined' || !FileService.getDefinition) return;
 
         event.event.preventDefault();
-
-        FileService.getDefinition(wordInfo.word, 'ruby').then(function(data) {
-          var results = data && Array.isArray(data.results) ? data.results : [];
-          if (results.length === 0) return;
-          var r = results[0];
-          var filename = r.file.split('/').pop();
-          if (typeof TabManager !== 'undefined' && TabManager.openTab) {
-            TabManager.openTab(r.file, filename, r.line);
-          }
-        }).catch(function() {});
+        navigateToWord(wordInfo.word);
       });
 
       // F12 — go to definition from keyboard
@@ -365,17 +381,7 @@
           if (!wordInfo || !wordInfo.word || wordInfo.word.length < 2) return;
           if (RUBY_KEYWORDS[wordInfo.word]) return;
           if (RUBY_CORE_METHODS[wordInfo.word]) return;
-          if (typeof FileService === 'undefined' || !FileService.getDefinition) return;
-
-          FileService.getDefinition(wordInfo.word, 'ruby').then(function(data) {
-            var results = data && Array.isArray(data.results) ? data.results : [];
-            if (results.length === 0) return;
-            var r = results[0];
-            var filename = r.file.split('/').pop();
-            if (typeof TabManager !== 'undefined' && TabManager.openTab) {
-              TabManager.openTab(r.file, filename, r.line);
-            }
-          }).catch(function() {});
+          navigateToWord(wordInfo.word);
         }
       });
     }
@@ -494,6 +500,8 @@
           'declare var ReactDOM: any;',
           'declare var PropTypes: any;',
           'declare var MaterialUI: any;',
+          'declare var $: any;',
+          'declare var jQuery: any;',
           'interface Window { [key: string]: any; }'
         ].join('\n'),
         'inmemory://mbeditor/sprockets-globals.d.ts'
@@ -506,6 +514,38 @@
           'inmemory://mbeditor/window-globals.d.ts'
         );
       }
+
+      // Downgrade "declared but never read" (TS6133) from Error to Warning.
+      // TypeScript has no built-in way to emit this as a warning, so we intercept
+      // the marker set after the worker fires and re-apply with lower severity.
+      // JS files use owner 'javascript', TS files use 'typescript'.
+      var WARN_CODES = { '6133': true };
+      var TS_OWNERS = ['javascript', 'typescript'];
+      var _severityPatchActive = false;
+      monaco.editor.onDidChangeMarkers(function(uris) {
+        if (_severityPatchActive) return;
+        _severityPatchActive = true;
+        try {
+          uris.forEach(function(uri) {
+            var model = monaco.editor.getModel(uri);
+            if (!model) return;
+            TS_OWNERS.forEach(function(owner) {
+              var markers = monaco.editor.getModelMarkers({ resource: uri, owner: owner });
+              var needsPatch = markers.some(function(m) {
+                return m.severity === monaco.MarkerSeverity.Error && WARN_CODES[String(m.code)];
+              });
+              if (!needsPatch) return;
+              monaco.editor.setModelMarkers(model, owner, markers.map(function(m) {
+                return (m.severity === monaco.MarkerSeverity.Error && WARN_CODES[String(m.code)])
+                  ? Object.assign({}, m, { severity: monaco.MarkerSeverity.Warning })
+                  : m;
+              }));
+            });
+          });
+        } finally {
+          _severityPatchActive = false;
+        }
+      });
     }
 
     // TypeScript: enable JSX for .tsx files and catch unused locals.

data/app/controllers/mbeditor/editors_controller.rb

@@ -337,7 +337,8 @@ module Mbeditor
                     workspace_root,
                     symbol,
                     excluded_dirnames: excluded_dirnames,
-                    excluded_paths: excluded_paths
+                    excluded_paths:    excluded_paths,
+                    included_dirs:     ruby_def_include_dirs
                   )
                   ri = RiDefinitionService.call(symbol)
                   workspace + ri
@@ -360,7 +361,8 @@ module Mbeditor
       file = RubyDefinitionService.module_defined_in(
         workspace_root, name,
         excluded_dirnames: excluded_dirnames,
-        excluded_paths:    excluded_paths
+        excluded_paths:    excluded_paths,
+        included_dirs:     ruby_def_include_dirs
       )
       return render json: { name: name, methods: [] } unless file
 
@@ -383,14 +385,16 @@ module Mbeditor
       # Fast no-op on subsequent calls (mtime checks only).
       RubyDefinitionService.scan(workspace_root,
                                  excluded_dirnames: excluded_dirnames,
-                                 excluded_paths:    excluded_paths)
+                                 excluded_paths:    excluded_paths,
+                                 included_dirs:     ruby_def_include_dirs)
 
       module_names = RubyDefinitionService.includes_in_file(path)
       includes = module_names.filter_map do |mod_name|
         mod_file = RubyDefinitionService.module_defined_in(
           workspace_root, mod_name,
           excluded_dirnames: excluded_dirnames,
-          excluded_paths:    excluded_paths
+          excluded_paths:    excluded_paths,
+          included_dirs:     ruby_def_include_dirs
         )
         next unless mod_file
 
@@ -1068,7 +1072,8 @@ module Mbeditor
         if File.directory?(full)
           { name: name, type: "folder", path: rel, children: build_tree(full, depth: depth + 1) }
         else
-          { name: name, type: "file", path: rel }
+          size = File.size(full) rescue nil
+          { name: name, type: "file", path: rel, size: size }
         end
       end
     rescue Errno::EACCES
@@ -1083,6 +1088,10 @@ module Mbeditor
       excluded_paths.filter { |path| !path.include?("/") }
     end
 
+    def ruby_def_include_dirs
+      Array(Mbeditor.configuration.ruby_def_include_dirs).map(&:to_s).reject(&:blank?)
+    end
+
     def excluded_path?(relative_path, name)
       excluded_paths.any? do |pattern|
         if pattern.include?("/")

data/app/services/mbeditor/ruby_definition_service.rb

@@ -51,10 +51,11 @@ module Mbeditor
       attr_reader :file_cache, :mutex
       attr_accessor :cache_path
 
-      def call(workspace_root, symbol, excluded_dirnames: [], excluded_paths: [])
+      def call(workspace_root, symbol, excluded_dirnames: [], excluded_paths: [], included_dirs: [])
         new(workspace_root, symbol,
             excluded_dirnames: excluded_dirnames,
-            excluded_paths: excluded_paths).call
+            excluded_paths:    excluded_paths,
+            included_dirs:     included_dirs).call
       end
 
       # Load the JSON cache from disk exactly once per process (double-checked
@@ -122,20 +123,26 @@ module Mbeditor
       # Searches the cache (and triggers a workspace scan if needed) to find
       # which file in +workspace_root+ defines the given module or class name.
       # Returns the absolute file path string or nil.
-      def module_defined_in(workspace_root, module_name, excluded_dirnames: [], excluded_paths: [])
+      def module_defined_in(workspace_root, module_name, excluded_dirnames: [], excluded_paths: [], included_dirs: [])
         load_disk_cache_once
+        root_prefix = workspace_root.to_s.chomp("/")
+        within_dirs = ->(path) {
+          return true if included_dirs.empty?
+          included_dirs.any? { |d| path.start_with?(File.join(root_prefix, d) + "/") }
+        }
         result = @mutex.synchronize do
-          @file_cache.find { |_path, entry| entry[:module_names]&.include?(module_name) }
+          @file_cache.find { |path, entry| within_dirs.call(path) && entry[:module_names]&.include?(module_name) }
         end
         return result[0] if result
 
         # Cache miss: scan workspace to populate cache entries with module_names.
         new(workspace_root, nil,
             excluded_dirnames: excluded_dirnames,
-            excluded_paths:    excluded_paths).scan_workspace
+            excluded_paths:    excluded_paths,
+            included_dirs:     included_dirs).scan_workspace
 
         result = @mutex.synchronize do
-          @file_cache.find { |_path, entry| entry[:module_names]&.include?(module_name) }
+          @file_cache.find { |path, entry| within_dirs.call(path) && entry[:module_names]&.include?(module_name) }
         end
         result ? result[0] : nil
       end
@@ -153,18 +160,20 @@ module Mbeditor
 
       # Convenience wrapper: scan the whole workspace to warm the cache.
       # Fast on subsequent calls (only re-parses files whose mtime changed).
-      def scan(workspace_root, excluded_dirnames: [], excluded_paths: [])
+      def scan(workspace_root, excluded_dirnames: [], excluded_paths: [], included_dirs: [])
         new(workspace_root, nil,
             excluded_dirnames: excluded_dirnames,
-            excluded_paths:    excluded_paths).scan_workspace
+            excluded_paths:    excluded_paths,
+            included_dirs:     included_dirs).scan_workspace
       end
     end
 
-    def initialize(workspace_root, symbol, excluded_dirnames: [], excluded_paths: [])
-      @workspace_root   = workspace_root.to_s.chomp("/")
-      @symbol           = symbol
+    def initialize(workspace_root, symbol, excluded_dirnames: [], excluded_paths: [], included_dirs: [])
+      @workspace_root    = workspace_root.to_s.chomp("/")
+      @symbol            = symbol
       @excluded_dirnames = Array(excluded_dirnames)
       @excluded_paths    = Array(excluded_paths)
+      @included_dirs     = Array(included_dirs)
     end
 
     # Walks the entire workspace and populates the per-file cache (including the
@@ -176,27 +185,29 @@ module Mbeditor
       files_scanned = 0
       evict_deleted_cache_entries
 
-      Find.find(@workspace_root) do |path|
-        if File.directory?(path)
-          dirname = File.basename(path)
-          rel_dir = relative_path(path)
-          Find.prune if path != @workspace_root && excluded_dir?(dirname, rel_dir)
-          next
-        end
-        next unless path.end_with?(".rb")
+      search_roots.each do |root|
+        Find.find(root) do |path|
+          if File.directory?(path)
+            dirname = File.basename(path)
+            rel_dir = relative_path(path)
+            Find.prune if path != root && excluded_dir?(dirname, rel_dir)
+            next
+          end
+          next unless path.end_with?(".rb")
 
-        rel = relative_path(path)
-        next if excluded_rel_path?(rel, File.basename(path))
+          rel = relative_path(path)
+          next if excluded_rel_path?(rel, File.basename(path))
 
-        files_scanned += 1
-        if files_scanned > MAX_FILES_SCANNED
-          Rails.logger.warn("[mbeditor] RubyDefinitionService: workspace exceeds #{MAX_FILES_SCANNED} .rb files; stopping scan early")
-          break
-        end
-        begin
-          cache_entry_for(path)
-        rescue StandardError
-          nil
+          files_scanned += 1
+          if files_scanned > MAX_FILES_SCANNED
+            Rails.logger.warn("[mbeditor] RubyDefinitionService: workspace exceeds #{MAX_FILES_SCANNED} .rb files; stopping scan early")
+            break
+          end
+          begin
+            cache_entry_for(path)
+          rescue StandardError
+            nil
+          end
         end
       end
 
@@ -212,46 +223,46 @@ module Mbeditor
 
       evict_deleted_cache_entries
 
-      Find.find(@workspace_root) do |path|
-        # Prune excluded directories
-        if File.directory?(path)
-          dirname = File.basename(path)
-          rel_dir = relative_path(path)
-          if path != @workspace_root && excluded_dir?(dirname, rel_dir)
-            Find.prune
+      search_roots.each do |root|
+        Find.find(root) do |path|
+          # Prune excluded directories
+          if File.directory?(path)
+            dirname = File.basename(path)
+            rel_dir = relative_path(path)
+            Find.prune if path != root && excluded_dir?(dirname, rel_dir)
+            next
           end
-          next
-        end
 
-        next unless path.end_with?(".rb")
+          next unless path.end_with?(".rb")
 
-        rel = relative_path(path)
-        next if excluded_rel_path?(rel, File.basename(path))
-
-        files_scanned += 1
-        if files_scanned > MAX_FILES_SCANNED
-          Rails.logger.warn("[mbeditor] RubyDefinitionService: workspace exceeds #{MAX_FILES_SCANNED} .rb files; stopping scan early")
-          break
-        end
+          rel = relative_path(path)
+          next if excluded_rel_path?(rel, File.basename(path))
 
-        begin
-          cached = cache_entry_for(path)
-          next unless cached
-
-          hit_lines = @symbol ? cached[:all_defs].fetch(@symbol, nil) : nil
-          next unless hit_lines && hit_lines.any?
+          files_scanned += 1
+          if files_scanned > MAX_FILES_SCANNED
+            Rails.logger.warn("[mbeditor] RubyDefinitionService: workspace exceeds #{MAX_FILES_SCANNED} .rb files; stopping scan early")
+            break
+          end
 
-          hit_lines.each do |def_line|
-            results << {
-              file:      rel,
-              line:      def_line,
-              signature: (cached[:lines][def_line - 1] || "").strip,
-              comments:  extract_comments(cached[:lines], def_line)
-            }
-            return results if results.length >= MAX_RESULTS
+          begin
+            cached = cache_entry_for(path)
+            next unless cached
+
+            hit_lines = @symbol ? cached[:all_defs].fetch(@symbol, nil) : nil
+            next unless hit_lines && hit_lines.any?
+
+            hit_lines.each do |def_line|
+              results << {
+                file:      rel,
+                line:      def_line,
+                signature: (cached[:lines][def_line - 1] || "").strip,
+                comments:  extract_comments(cached[:lines], def_line)
+              }
+              return results if results.length >= MAX_RESULTS
+            end
+          rescue StandardError
+            # Malformed file or unreadable; skip silently
           end
-        rescue StandardError
-          # Malformed file or unreadable; skip silently
         end
       end
 
@@ -386,6 +397,15 @@ module Mbeditor
       full_path.to_s.delete_prefix(@workspace_root).delete_prefix("/")
     end
 
+    def search_roots
+      return [@workspace_root] if @included_dirs.empty?
+
+      dirs = @included_dirs
+               .map { |d| File.join(@workspace_root, d) }
+               .select { |d| File.directory?(d) }
+      dirs.empty? ? [@workspace_root] : dirs
+    end
+
     def excluded_dir?(dirname, rel_dir)
       @excluded_dirnames.include?(dirname) ||
         @excluded_paths.any? do |pattern|

data/lib/mbeditor/configuration.rb

@@ -6,7 +6,8 @@ module Mbeditor
                   :redmine_enabled, :redmine_url, :redmine_api_key, :redmine_ticket_source,
                   :test_framework, :test_command, :test_timeout,
                   :authenticate_with,
-                  :lint_timeout, :base_branch_candidates, :git_timeout
+                  :lint_timeout, :base_branch_candidates, :git_timeout,
+                  :ruby_def_include_dirs
 
     def initialize
       @allowed_environments = [:development]
@@ -22,7 +23,8 @@ module Mbeditor
       @test_timeout     = 60  # seconds
       @lint_timeout     = 15  # seconds for RuboCop/haml-lint subprocesses
       @base_branch_candidates = %w[origin/develop origin/main origin/master develop main master]
-      @git_timeout      = nil # seconds; nil disables (no timeout on git subprocesses)
+      @git_timeout            = nil # seconds; nil disables (no timeout on git subprocesses)
+      @ruby_def_include_dirs  = %w[app/models app/controllers app/helpers app/concerns]
     end
   end
 end

data/lib/mbeditor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mbeditor
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Oliver Noonan