Code

Add support for 5.3.0#1850

Code

Merged

voodoos merged 59 commits intoocaml:mainocaml/merlin:mainfrom xvw:503-previewxvw/merlin:503-previewCopy head branch name to clipboardDec 13, 2024

+108,594-14,949

Commits

Commits on Dec 13, 2024

• Fetch OCaml upstream ocaml/ocaml upstream

  Show description for 9954422
  

  xvw

  authored and

  voodoos

  committed
  9954422

  Copy full SHA for 9954422

• Upgrade gen_patch (migration script)

  

  xvw

  authored and

  voodoos

  committed
  bde3b20

  Copy full SHA for bde3b20

• Be more smart on patch application

  

  xvw

  authored and

  voodoos

  committed
  f71ff1d

  Copy full SHA for f71ff1d

• Apply valid patches

  

  xvw

  authored and

  voodoos

  committed
  7809471

  Copy full SHA for 7809471

• Apply a first bunch of patches

  

  xvw

  authored and

  voodoos

  committed
  06262b5

  Copy full SHA for 06262b5

• Fix conflict and patch type incoherence

  

  xvw

  authored and

  voodoos

  committed
  d00249c

  Copy full SHA for d00249c

• Missing Msupport occurences

  

  xvw

  authored and

  voodoos

  committed
  4932b60

  Copy full SHA for 4932b60

• Update Parser

  

  xvw

  authored and

  voodoos

  committed
  26db64d

  Copy full SHA for 26db64d

• Revert parser upgrade

  voodoos

  committed
  acf93eb

  Copy full SHA for acf93eb

• Re-apply parser changes

  voodoos

  committed
  c7941d3

  Copy full SHA for c7941d3

• Rename token

  voodoos

  committed
  e5e896b

  Copy full SHA for e5e896b

• Remove commented code

  voodoos

  committed
  67f0471

  Copy full SHA for 67f0471

• Restore files

  

  xvw

  authored and

  voodoos

  committed
  3acf1db

  Copy full SHA for 3acf1db

• Split Doc representation of Printtyp in a dedicated module

  

  xvw

  authored and

  voodoos

  committed
  0d18ae6

  Copy full SHA for 0d18ae6

• Apply some patches

  

  xvw

  authored and

  voodoos

  committed
  b56697a

  Copy full SHA for b56697a

• Restore source un pprintast

  

  xvw

  authored and

  voodoos

  committed
  0f4cc67

  Copy full SHA for 0f4cc67

• Remove rejected useless files

  

  xvw

  authored and

  voodoos

  committed
  797b858

  Copy full SHA for 797b858

• Deduce unit info from configuration

  voodoos

  committed
  95e572e

  Copy full SHA for 95e572e

• Fix string_of_label usage

  

  xvw

  authored and

  voodoos

  committed
  a896341

  Copy full SHA for a896341

• Upgrade compiler matrix

  

  xvw

  authored and

  voodoos

  committed
  115270e

  Copy full SHA for 115270e

• Fix ocaml version bound

  

  xvw

  authored and

  voodoos

  committed
  4c439d7

  Copy full SHA for 4c439d7

• Bump Magic Numbers

  

  xvw

  authored and

  voodoos

  committed
  f0de2c1

  Copy full SHA for f0de2c1

• Fix ocamlversion bump

  

  xvw

  authored and

  voodoos

  committed
  98596db

  Copy full SHA for 98596db

• Fix Bump Magic number

  

  xvw

  authored and

  voodoos

  committed
  77048fd

  Copy full SHA for 77048fd

• Promote test (for review)

  

  xvw

  authored and

  voodoos

  committed
  aadae7e

  Copy full SHA for aadae7e

• test: move ppx dependent tests in correct folder

  voodoos

  committed
  163ae51

  Copy full SHA for 163ae51

• Get the CI running

  voodoos

  committed
  10d87c3

  Copy full SHA for 10d87c3

• Remove ocaml constraint from merlin package

  voodoos

  committed
  b8d4729

  Copy full SHA for b8d4729

• Add some utils for API compatibility

  voodoos

  committed
  219d847

  Copy full SHA for 219d847

• Prevent formatting of format_doc

  voodoos

  committed
  525585d

  Copy full SHA for 525585d

• CI: disable fmt check and try to enable ocaml-lsp compat

  voodoos

  committed
  8bd979f

  Copy full SHA for 8bd979f

• fix lsp ci

  voodoos

  committed
  1dc8e25

  Copy full SHA for 1dc8e25

• remove conflict with base-effect

  voodoos

  committed
  1318ff7

  Copy full SHA for 1318ff7

• Pull latest changes from upstream

  voodoos

  committed
  dd01f2c

  Copy full SHA for dd01f2c

• Apply latest changes

  voodoos

  committed
  5751cb4

  Copy full SHA for 5751cb4

• Fetch latest version from upstream (5.3 beta2)

  voodoos

  committed
  1d74088

  Copy full SHA for 1d74088

• Upgrade vendored typer

  voodoos

  committed
  2c784ac

  Copy full SHA for 2c784ac

• Pormote updated tests

  voodoos

  committed
  8df9b22

  Copy full SHA for 8df9b22

• Have script handle same-ver patches

  voodoos

  committed
  88d8f1b

  Copy full SHA for 88d8f1b

• Bump ocaml version in CI

  voodoos

  committed
  ba890a6

  Copy full SHA for ba890a6

• Remove unused forward declaration

  voodoos

  committed
  62a886b

  Copy full SHA for 62a886b

• Promote updated tests

  voodoos

  committed
  5546079

  Copy full SHA for 5546079

• Add changelog entry

  voodoos

  committed
  eecc0d3

  Copy full SHA for eecc0d3

• Lexer: merge new keyword handling

  voodoos

  committed
  383f7c7

  Copy full SHA for 383f7c7

• Lexer: merge utf8 support and reduce distance with upstream

  voodoos

  committed
  e89665c

  Copy full SHA for e89665c

• Remove patch files

  voodoos

  committed
  218a076

  Copy full SHA for 218a076

• Fix class related tests and reduce diff with upstream

  voodoos

  committed
  a9633ca

  Copy full SHA for a9633ca

• Copy string_of_label in Asttypes

  voodoos

  committed
  def5221

  Copy full SHA for def5221

• Review Typemod upgrade

  voodoos

  committed
  78b6613

  Copy full SHA for 78b6613

• Review Typecore

  voodoos

  committed
  73da8ff

  Copy full SHA for 73da8ff

• Review btype

  voodoos

  committed
  98a6415

  Copy full SHA for 98a6415

• Review typedecl

  voodoos

  committed
  b4c6a0a

  Copy full SHA for b4c6a0a

• Fix regression in construct test

  voodoos

  committed
  62662e7

  Copy full SHA for 62662e7

• Fiw newtype' regression

  voodoos

  committed
  6b34003

  Copy full SHA for 6b34003

• Add logging in syntax_doc

  voodoos

  committed
  13c8e50

  Copy full SHA for 13c8e50

• Fix spurious unboxing messages

  voodoos

  committed
  e4740fc

  Copy full SHA for e4740fc

• Promote test change related to newtype handling

  voodoos

  committed
  c30a437

  Copy full SHA for c30a437

• Minor tests tweaks

  voodoos

  committed
  1e5d4a6

  Copy full SHA for 1e5d4a6

• Add test showing regression with some error message printing

  voodoos

  committed
  6b92655

  Copy full SHA for 6b92655