Skip to content

fix(module): stabilize fuzzy require resolution across duplicate suffix matches#969

Merged
CppCXY merged 1 commit intoEmmyLuaLs:mainfrom
lewis6991:fix/resolve_stable
Feb 27, 2026
Merged

fix(module): stabilize fuzzy require resolution across duplicate suffix matches#969
CppCXY merged 1 commit intoEmmyLuaLs:mainfrom
lewis6991:fix/resolve_stable

Conversation

@lewis6991
Copy link
Collaborator

When multiple indexed modules share the same trailing require path (for
example plugin/treesitter-context.lua and lua/treesitter-context.lua),
fuzzy lookup previously returned the first inserted candidate. Because
indexing/insertion order can vary, require('treesitter-context') could
intermittently resolve to different files and sometimes degrade to any
when a non-exporting candidate won.

This change makes fuzzy resolution deterministic by selecting the best
match using:

  • smallest leading-segment count before the requested module path
  • lexicographic full-module-name tie-break for stable ordering

This preserves existing fuzzy behavior while removing insertion-order
flakiness.

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @lewis6991, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request resolves an issue where fuzzy module resolution could be non-deterministic, leading to inconsistent module loading when multiple modules shared similar trailing paths. The changes introduce a robust selection mechanism to ensure that the same module is always chosen under identical conditions, improving reliability and predictability in module imports.

Highlights

  • Stabilized Fuzzy Module Resolution: Addressed non-deterministic module resolution where multiple indexed modules with the same trailing require path could resolve inconsistently due to varying indexing/insertion order.
  • New Selection Logic: Implemented a deterministic selection process that prioritizes modules with the smallest leading-segment count before the requested module path, using lexicographic ordering for tie-breaking.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • crates/emmylua_code_analysis/src/db_index/module/mod.rs
    • Modified fuzzy_find_module to iterate through all matching modules instead of returning the first one.
    • Introduced logic to calculate leading_segment_count for each potential module.
    • Implemented a comparison mechanism to select the "best" module based on leading_segment_count and lexicographical full_module_name.
  • crates/emmylua_code_analysis/src/db_index/module/test.rs
    • Added test_require_fuzzy_match_prefers_shortest_prefix to verify that the module with the shortest prefix is chosen.
    • Added test_require_fuzzy_match_prefers_shortest_prefix_reverse_insert to confirm that insertion order does not affect the deterministic selection.
Activity
  • No human activity has been recorded on this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces a deterministic approach for fuzzy module resolution when multiple candidates match a suffix, which is a great improvement. The logic correctly uses the leading segment count and lexicographical sorting to find the best match, resolving potential flakiness. The new tests adequately cover the implemented logic. My review includes a couple of suggestions to improve code clarity and reduce duplication.

…ix matches

When multiple indexed modules share the same trailing require path (for
example plugin/treesitter-context.lua and lua/treesitter-context.lua),
fuzzy lookup previously returned the first inserted candidate. Because
indexing/insertion order can vary, require('treesitter-context') could
intermittently resolve to different files and sometimes degrade to any
when a non-exporting candidate won.

This change makes fuzzy resolution deterministic by selecting the best
match using:
- smallest leading-segment count before the requested module path
- lexicographic full-module-name tie-break for stable ordering

This preserves existing fuzzy behavior while removing insertion-order
flakiness.
@CppCXY CppCXY merged commit 2372bd6 into EmmyLuaLs:main Feb 27, 2026
22 checks passed
@lewis6991 lewis6991 deleted the fix/resolve_stable branch February 27, 2026 07:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants