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

Ocaml update2 #4445

Closed
wants to merge 18 commits into from
Closed

Ocaml update2 #4445

wants to merge 18 commits into from

Conversation

@XVilka
Copy link

XVilka commented May 28, 2019

Imported changes (saving the history) from https://github.com/rgrinberg/vim-ocaml

cc @chrisbra @mmottl @rgrinberg @copy @hcarty

Follow up of #4443

I did a git filter-branch of runtime/syntax/ocaml.vim, separated the file history from the rest of the files, grafted it to the 16ea367, and rebased after, tranforming changes to the appropriate syntax. On top of that added my small bytes keyword change.

rgrinberg and others added 18 commits May 28, 2019
* Generative functors
* Quoted strings
…ule includes

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
`\{-}` does a non-greedy match so code like this will highlight correctly:

    let foo = {|a string|}
    let bar = {|another string|}
following mmottl
Use apostrophe as iskeyword only in ocaml files, do not enforce it globally — other languages might use apostrophes as string separators, and "set isk+='" makes word boundary commands needlessly complicated (most notably, cw eating final separator).
It is just a function in `Pervasives` and is otherwise a valid
identifier.
This is an attempt to fix the highlighting for `[@@bs.module ...]`
(defined by BuckleScript) in external declarations.

This defines a syntactic region between `[@@`/`]` and `[@`/`]` which
allows any top level syntax inside.
Relatively recent versions of OCaml have a
separate mutable data type - bytes, along
with string for immutable data.
@codecov-io

This comment has been minimized.

Copy link

codecov-io commented May 28, 2019

Codecov Report

Merging #4445 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4445      +/-   ##
==========================================
+ Coverage   80.47%   80.47%   +<.01%     
==========================================
  Files         110      110              
  Lines      143079   143079              
==========================================
+ Hits       115143   115149       +6     
+ Misses      27936    27930       -6
Impacted Files Coverage Δ
src/gui_gtk_x11.c 48.67% <0%> (-0.1%) ⬇️
src/ex_cmds.c 82.18% <0%> (-0.1%) ⬇️
src/gui.c 57.94% <0%> (ø) ⬆️
src/terminal.c 80.97% <0%> (+0.03%) ⬆️
src/term.c 73.89% <0%> (+0.05%) ⬆️
src/window.c 87.15% <0%> (+0.06%) ⬆️
src/ui.c 55.67% <0%> (+0.07%) ⬆️
src/if_xcmdsrv.c 84.2% <0%> (+0.71%) ⬆️
src/gui_beval.c 62.93% <0%> (+0.86%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b58a4b9...2df091f. Read the comment docs.

@k-takata k-takata added the runtime label May 28, 2019
@brammool

This comment has been minimized.

Copy link
Member

brammool commented May 28, 2019

So, this includes lots of improvements from all kinds of places. Is the header still valid then? Or do you expect one of the mentioned maintainers to approve this pull request?

@XVilka

This comment has been minimized.

Copy link
Author

XVilka commented May 29, 2019

@hcarty

This comment has been minimized.

Copy link

hcarty commented May 29, 2019

LGTM for my small contribution. Thanks for pushing this upstream @XVilka!

@XVilka XVilka mentioned this pull request May 29, 2019
4 of 6 tasks complete
@copy

This comment has been minimized.

Copy link

copy commented Jun 3, 2019

I've reviewed most of these changes on the upstream repo and they look good to me too.

@XVilka

This comment has been minimized.

Copy link
Author

XVilka commented Jun 4, 2019

@brammool I think now it is ready then, since 2 of maintainers reviewed.

@mmottl

This comment has been minimized.

Copy link

mmottl commented Jun 4, 2019

Sorry for the late review, the changes are fine with me!

@brammool

This comment has been minimized.

Copy link
Member

brammool commented Jun 6, 2019

I'll include it, thanks.

@brammool brammool closed this Jun 6, 2019
@XVilka XVilka deleted the XVilka:ocaml-update2 branch Jun 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.