Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move branch master to 5.2 support #1757

Merged
merged 130 commits into from
May 13, 2024
Merged

Move branch master to 5.2 support #1757

merged 130 commits into from
May 13, 2024

Commits on May 2, 2024

  1. upstream: remove 4.13 directory

    trefis authored and voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    fa22d01 View commit details
    Browse the repository at this point in the history
  2. upstream: add 5.00

    trefis authored and voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    46a480b View commit details
    Browse the repository at this point in the history
  3. Merge changes from upstream

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a6fe261 View commit details
    Browse the repository at this point in the history
  4. Update CI and opam file

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    21365b8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d5b9598 View commit details
    Browse the repository at this point in the history
  6. Compat with 5.0.0

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    de1c084 View commit details
    Browse the repository at this point in the history
  7. Test update

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    0b53f2a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    9a76e84 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a9d4f0d View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    aa80305 View commit details
    Browse the repository at this point in the history
  11. fix load_path usages

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7b350f2 View commit details
    Browse the repository at this point in the history
  12. Add str lib explicitely

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    60ed321 View commit details
    Browse the repository at this point in the history
  13. Fix tests using unix

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a5297cc View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    c73c4d1 View commit details
    Browse the repository at this point in the history
  15. Try to enable CI

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7991af6 View commit details
    Browse the repository at this point in the history
  16. Remove warning desactivation

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a93dd8e View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    4ed41f1 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    69ef238 View commit details
    Browse the repository at this point in the history
  19. Test update

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    b3b6ac3 View commit details
    Browse the repository at this point in the history
  20. Fetch latest upstream version of OCaml 5

    1470e1e9b13341893e68f404c5c798d0259bb564
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    64faaa8 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    646d3fb View commit details
    Browse the repository at this point in the history
  22. Parser update

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    06b901f View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    7b7add3 View commit details
    Browse the repository at this point in the history
  24. Add test for issue ocaml#1518

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a3a0562 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    b53c43c View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    1b55284 View commit details
    Browse the repository at this point in the history
  27. Mark some C variables as unused (ocaml#1541)

    from antalsz/unused-c-variables
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    39491ae View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    c64b491 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    e264c39 View commit details
    Browse the repository at this point in the history
  30. Recognize OCaml 5.0 cmi magic number

    And add an assertion that we can recognize our own magic number that we
    got compiled with.
    
    Fixes ocaml#1553
    
    Signed-off-by: Edwin Török <[email protected]>
    edwintorok authored and voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    4acd5b8 View commit details
    Browse the repository at this point in the history
  31. Add changelog entry for cmi version fix

    Signed-off-by: Edwin Török <[email protected]>
    edwintorok authored and voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    064b7a2 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    4b2d533 View commit details
    Browse the repository at this point in the history
  33. Fetch ocaml upstream at #5.0.0

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    466a771 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    453fbd5 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    ade86ac View commit details
    Browse the repository at this point in the history
  36. Backport: Fix Broken eq comparison in merlin.el (ocaml#1549)

    from mattiase/eq-warning
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    15fcda6 View commit details
    Browse the repository at this point in the history
  37. Backport: Emacs Xref improvements (ocaml#1385)

    from mattiase/xref
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d0b5b59 View commit details
    Browse the repository at this point in the history
  38. Backport: Improve locate of ill-typed exprs (ocaml#1546)

    from voodoos/locate-ill-typed
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    61b9171 View commit details
    Browse the repository at this point in the history
  39. Prepare for release 4.8-500

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    989e86c View commit details
    Browse the repository at this point in the history
  40. Uniformize Changelog

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9d48a9d View commit details
    Browse the repository at this point in the history
  41. [B] Add readme note about menhir pin (ocaml#1605)

    from 3Rafal/note-about-menhir-version
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    35bc765 View commit details
    Browse the repository at this point in the history
  42. Configuration menu
    Copy the full SHA
    c997578 View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    2bf0c2e View commit details
    Browse the repository at this point in the history
  44. Copy upstream files at 5.1

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    359ed5b View commit details
    Browse the repository at this point in the history
  45. Configuration menu
    Copy the full SHA
    e215a13 View commit details
    Browse the repository at this point in the history
  46. Bump opam files to 5.1

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    84ca5db View commit details
    Browse the repository at this point in the history
  47. Add a changelog entry

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    7f00508 View commit details
    Browse the repository at this point in the history
  48. Prepare CI for 5.1

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9b0fd0b View commit details
    Browse the repository at this point in the history
  49. Prepare for release 4.11-501

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    4276155 View commit details
    Browse the repository at this point in the history
  50. Configuration menu
    Copy the full SHA
    daf31ee View commit details
    Browse the repository at this point in the history
  51. Add test illustrating ocaml#1703

    Merlin has no use for the `-cmi-file` flag but should not reject it.
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    4012a91 View commit details
    Browse the repository at this point in the history
  52. Configuration menu
    Copy the full SHA
    742f484 View commit details
    Browse the repository at this point in the history
  53. Add change entry for 11710

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    80a6f5c View commit details
    Browse the repository at this point in the history
  54. Pull latest changes from upsteam

    (35fdd0226e2e05a1a8244ecfec780b563b23b59c)
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    419becf View commit details
    Browse the repository at this point in the history
  55. Configuration menu
    Copy the full SHA
    95dc450 View commit details
    Browse the repository at this point in the history
  56. Configuration menu
    Copy the full SHA
    7b0dcd6 View commit details
    Browse the repository at this point in the history
  57. Bump minimal OCaml version

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    3713299 View commit details
    Browse the repository at this point in the history
  58. Update changelog

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    13e55cd View commit details
    Browse the repository at this point in the history
  59. upstream: fetch latest changes from 5.2 branch.

    rev: 02b39701d81ef4d4f5824a2d018e6387b1eeb5a7
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    4640531 View commit details
    Browse the repository at this point in the history
  60. fix auto-patcher

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1c4064f View commit details
    Browse the repository at this point in the history
  61. Configuration menu
    Copy the full SHA
    36ff3d4 View commit details
    Browse the repository at this point in the history
  62. Configuration menu
    Copy the full SHA
    1711442 View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    f1e2ceb View commit details
    Browse the repository at this point in the history
  64. Use new iterator to perform locate and occurrences

    - enable or disable aliases traversal
    - mark approximated results as such
    - improve constr / labels cases + traverse aliases
    - refactor locate and env_lookup
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    80f29ff View commit details
    Browse the repository at this point in the history
  65. Build with new Texp_function nodes

    FIXME Merlin recovery and other feature related to functions are probably broken
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    dc39730 View commit details
    Browse the repository at this point in the history
  66. config: bump magic number

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    ee8c43e View commit details
    Browse the repository at this point in the history
  67. Configuration menu
    Copy the full SHA
    840a50e View commit details
    Browse the repository at this point in the history
  68. tests: promote improved tests

    and expected locations improvements
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    6a865dd View commit details
    Browse the repository at this point in the history
  69. Configuration menu
    Copy the full SHA
    f94393b View commit details
    Browse the repository at this point in the history
  70. Configuration menu
    Copy the full SHA
    92d32b7 View commit details
    Browse the repository at this point in the history
  71. Configuration menu
    Copy the full SHA
    86c411e View commit details
    Browse the repository at this point in the history
  72. Configuration menu
    Copy the full SHA
    5d37374 View commit details
    Browse the repository at this point in the history
  73. Configuration menu
    Copy the full SHA
    1fcb58a View commit details
    Browse the repository at this point in the history
  74. env_lookup: log in all cases

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    f67393c View commit details
    Browse the repository at this point in the history
  75. destruct: add test for fun. param. case analysis

    This test include the result from merlin-501 and does not past after the update.
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    5dd0291 View commit details
    Browse the repository at this point in the history
  76. tests: more updates

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    aedc47d View commit details
    Browse the repository at this point in the history
  77. Configuration menu
    Copy the full SHA
    dcfa0dd View commit details
    Browse the repository at this point in the history
  78. Configuration menu
    Copy the full SHA
    0903757 View commit details
    Browse the repository at this point in the history
  79. Configuration menu
    Copy the full SHA
    4beafb6 View commit details
    Browse the repository at this point in the history
  80. Configuration menu
    Copy the full SHA
    fca9b6e View commit details
    Browse the repository at this point in the history
  81. tests: promote changes

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    069261b View commit details
    Browse the repository at this point in the history
  82. Configuration menu
    Copy the full SHA
    861388e View commit details
    Browse the repository at this point in the history
  83. Configuration menu
    Copy the full SHA
    192658b View commit details
    Browse the repository at this point in the history
  84. Configuration menu
    Copy the full SHA
    5358cf5 View commit details
    Browse the repository at this point in the history
  85. Prepare for preview release

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    729a8cc View commit details
    Browse the repository at this point in the history
  86. Configuration menu
    Copy the full SHA
    4ab50e8 View commit details
    Browse the repository at this point in the history
  87. Configuration menu
    Copy the full SHA
    3a0f31b View commit details
    Browse the repository at this point in the history
  88. recovery: fix erroneous type repr

    Co-authored-by: Frédéric Bour <[email protected]>
    voodoos and let-def committed May 2, 2024
    Configuration menu
    Copy the full SHA
    b9a727d View commit details
    Browse the repository at this point in the history
  89. Configuration menu
    Copy the full SHA
    fce3c27 View commit details
    Browse the repository at this point in the history
  90. Configuration menu
    Copy the full SHA
    32378c2 View commit details
    Browse the repository at this point in the history
  91. occurrences: introduce a cache for the index

    The cache is based on the typer's stamp and should make successive occurrences queries faster.
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    8cd46cb View commit details
    Browse the repository at this point in the history
  92. Configuration menu
    Copy the full SHA
    1bd0d88 View commit details
    Browse the repository at this point in the history
  93. Configuration menu
    Copy the full SHA
    3b4d0d9 View commit details
    Browse the repository at this point in the history
  94. Configuration menu
    Copy the full SHA
    f7512b2 View commit details
    Browse the repository at this point in the history
  95. Configuration menu
    Copy the full SHA
    dbdd17d View commit details
    Browse the repository at this point in the history
  96. Configuration menu
    Copy the full SHA
    e75c892 View commit details
    Browse the repository at this point in the history
  97. Configuration menu
    Copy the full SHA
    bce24e5 View commit details
    Browse the repository at this point in the history
  98. Test case and changelog for ocaml#1739

    xvw authored and voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a12d6a9 View commit details
    Browse the repository at this point in the history
  99. Refactor destruct

    Fragment the various stages of the `node` function to facilitate
    understanding of its flow and the reuse of parts.
    xvw authored and voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    fbaa902 View commit details
    Browse the repository at this point in the history
  100. Fix ocaml#1739: destruct in function arguments

    xvw authored and voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    9ac6228 View commit details
    Browse the repository at this point in the history
  101. Additional tests using 1-elt sum/record

    xvw authored and voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    a62af42 View commit details
    Browse the repository at this point in the history
  102. Add more bunch of test and remove old FIXME

    xvw authored and voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    881892e View commit details
    Browse the repository at this point in the history
  103. Configuration menu
    Copy the full SHA
    8ac60d0 View commit details
    Browse the repository at this point in the history
  104. Configuration menu
    Copy the full SHA
    4cd85fc View commit details
    Browse the repository at this point in the history
  105. Fix a typo in lexer_raw

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    91c05c7 View commit details
    Browse the repository at this point in the history
  106. Configuration menu
    Copy the full SHA
    c2d0346 View commit details
    Browse the repository at this point in the history
  107. Attempt to please ocaml-ci

    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    5d4a662 View commit details
    Browse the repository at this point in the history
  108. Configuration menu
    Copy the full SHA
    fb5ffad View commit details
    Browse the repository at this point in the history
  109. Configuration menu
    Copy the full SHA
    3b78aa8 View commit details
    Browse the repository at this point in the history
  110. occurrences: do not attempt to shrink the selection of idents that ne…

    …eds parenthesis
    
    Doing that properly require compiler support for located longidents.
    voodoos committed May 2, 2024
    Configuration menu
    Copy the full SHA
    1850cbe View commit details
    Browse the repository at this point in the history
  111. Configuration menu
    Copy the full SHA
    2ce5d3c View commit details
    Browse the repository at this point in the history
  112. Configuration menu
    Copy the full SHA
    9374eae View commit details
    Browse the repository at this point in the history
  113. Configuration menu
    Copy the full SHA
    3532f9e View commit details
    Browse the repository at this point in the history
  114. Configuration menu
    Copy the full SHA
    57f704b View commit details
    Browse the repository at this point in the history
  115. Configuration menu
    Copy the full SHA
    fb180ed View commit details
    Browse the repository at this point in the history
  116. Configuration menu
    Copy the full SHA
    e8c91f8 View commit details
    Browse the repository at this point in the history
  117. Configuration menu
    Copy the full SHA
    ee41c4d View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Pull latest changes from upstream

    dfe59502ad2e115882296416afc4cfd814821572
    voodoos committed May 3, 2024
    Configuration menu
    Copy the full SHA
    5e9eab2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    477132d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    48abbf4 View commit details
    Browse the repository at this point in the history
  4. Re-enable ppx tests

    voodoos committed May 3, 2024
    Configuration menu
    Copy the full SHA
    1d3e934 View commit details
    Browse the repository at this point in the history
  5. tests: remove staled fixme

    voodoos committed May 3, 2024
    Configuration menu
    Copy the full SHA
    6f85342 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    aafec74 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. hidden path: also use for ppxes and Path_list

    Authored-by: Liam Stevenson <[email protected]>
    voodoos committed May 6, 2024
    Configuration menu
    Copy the full SHA
    cde4ea9 View commit details
    Browse the repository at this point in the history
  2. tests: more hidden path tests

    Authored-by: Liam Stevenson <[email protected]>
    voodoos committed May 6, 2024
    Configuration menu
    Copy the full SHA
    b5fe8d7 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Configuration menu
    Copy the full SHA
    082a1ac View commit details
    Browse the repository at this point in the history
  2. locate: fix alias traversal

    voodoos committed May 13, 2024
    Configuration menu
    Copy the full SHA
    77d00e4 View commit details
    Browse the repository at this point in the history
  3. test: promote

    voodoos committed May 13, 2024
    Configuration menu
    Copy the full SHA
    a1547db View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    02959ba View commit details
    Browse the repository at this point in the history
  5. Remove old occurrences code

    voodoos committed May 13, 2024
    Configuration menu
    Copy the full SHA
    11bc49a View commit details
    Browse the repository at this point in the history