Replace spaces in socketname with '_' by ttamttam · Pull Request #1345 · ocaml/merlin

ttamttam · 2021-06-05T08:36:03Z

On windows, if the username retrieved by GetUserName contain spaces, they end up in the socketname, and emacs fails when trying to open it.

let-def · 2021-06-07T09:14:02Z

The patch look good thanks. I am surprised by the emacs bit: the socketname should not leak to the editor, right?

ttamttam · 2021-06-07T10:11:42Z

The patch look good thanks. I am surprised by the emacs bit: the socketname should not leak to the editor, right?

A more detailed explanation of how I found this solution is here:

#599 (comment)

Roughly (I did not check), I would think that at some time, ocamlmerlin has to say to the editor which socket it should connect to?

I can no more test it, because I renamed my windows account since then (which was not easy…).

Best regards

let-def · 2021-06-07T11:38:18Z

Indeed, now I remember. Thanks for the PR. The socketpath does not leak in normal emacs mode, it is only provided in the debug info. Emacs does not connect directly to the socket, the merlin wrapper handles both side (starting a server if there is none, connecting to it if there is one).
So the problem has to do with some Windows IPC that I does not understand, but I am glad the _ fixes it, thanks!

let-def · 2021-06-07T11:38:45Z

(Maybe @dra27 can tell us more about that?)

ttamttam · 2021-06-20T12:53:57Z

replacing the USER by it’s SID.

Instead of removing spaces, I tried to follow @dra27 original plan (see #599 (comment)).

dra27

Some comments on the implementation as given, but I think it's better to avoid LookupAccountName and do GetCurrentProcessId -> OpenProcessToken -> GetTokenInformation with the TokenUser class which yields a TOKEN_USER struct containing the SID which finally goes on to the code you already have for ConvertSidToStringSid!

src/frontend/ocamlmerlin/ocamlmerlin.c

ttamttam · 2021-06-21T10:37:04Z

Thanks @dra27 . I’ll have a look. Despite how painful is C for me, nowadays!

dra27

The only important change is the (un-)capitalisation of Sddl.h - this looks correct to me, thanks!

The rest is C "style" points, which are very much "take or leave":

Assignments of NULL after free makes the flow harder to follow (for me), especially when there's a clear return statement following (i.e. there's visibly no chance of use-after-free)
I'd definitely use Windows API types
Personally, I think return NULL; is a much clearer statement of intent than return usidstr; where usidstr was set to NULL many control blocks and lines earlier.

I haven't actually compiled this - happy to be pinged to do that as and when it's confirmed ready to merge!

dra27 · 2021-07-21T09:36:17Z

src/frontend/ocamlmerlin/ocamlmerlin.c

+{
+  char * usidstr = NULL;
+
+  void * process_token = NULL;


Suggested change

void * process_token = NULL;

HANDLE process_token;

(don't second-guess Windows API types)

dra27 · 2021-07-21T09:36:51Z

src/frontend/ocamlmerlin/ocamlmerlin.c

+
+  void * process_token = NULL;
+  if ( ! OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &process_token ) )
+    return usidstr;


Personally, I would explicitly NULL here, rather than subtly via a variable

Suggested change

return usidstr;

return NULL;

dra27 · 2021-07-21T09:38:52Z

src/frontend/ocamlmerlin/ocamlmerlin.c

+  if ( ! OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &process_token ) )
+    return usidstr;
+
+  unsigned long sid_buffer_size = 0;


Suggested change

unsigned long sid_buffer_size = 0;

DWORD sid_buffer_size;

dra27 · 2021-07-21T09:39:06Z

src/frontend/ocamlmerlin/ocamlmerlin.c

+    process_token = NULL;
+    return usidstr;


Suggested change

process_token = NULL;

return usidstr;

return NULL;

(this isn't C++ - the assignment of NULL should be eliminated by the optimiser anyway 🙂)

dra27 · 2021-07-21T09:40:04Z

src/frontend/ocamlmerlin/ocamlmerlin.c

+    process_token = NULL;
+    return usidstr;


Suggested change

process_token = NULL;

return usidstr;

return NULL;

(as before)

dra27 · 2021-07-21T09:45:18Z

src/frontend/ocamlmerlin/ocamlmerlin.c

+  ConvertSidToStringSid(token_user_ptr->User.Sid, &usidstr);
+
+  free(token_user_ptr);
+  token_user_ptr = NULL;
+  CloseHandle(process_token);
+  process_token = NULL;
+
+  return usidstr;


Suggested change

ConvertSidToStringSid(token_user_ptr->User.Sid, &usidstr);

free(token_user_ptr);

token_user_ptr = NULL;

CloseHandle(process_token);

process_token = NULL;

return usidstr;

if (!ConvertSidToStringSid(token_user_ptr->User.Sid, &usidstr)

usidstr = NULL;

free(token_user_ptr);

CloseHandle(process_token);

return usidstr;

dra27 · 2021-07-21T09:45:50Z

src/frontend/ocamlmerlin/ocamlmerlin.c

+/* May return NULL */
+char * retrieve_user_sid_string()
+{
+  char * usidstr = NULL;


Suggested change

char * usidstr = NULL;

LPSTR usidstr;

dra27 · 2021-07-21T09:50:14Z

src/frontend/ocamlmerlin/ocamlmerlin.c

 #ifdef _WIN32
+
+/* May return NULL */
+char * retrieve_user_sid_string()


Suggested change

char * retrieve_user_sid_string()

LPSTR retrieve_user_sid_string()

dra27 · 2021-07-21T09:53:58Z

src/frontend/ocamlmerlin/ocamlmerlin.c

      "\\\\.\\pipe\\%s", eventname);
+
+  LocalFree(user_sid_string);
+  user_sid_string = NULL;


Suggested change

user_sid_string = NULL;

dra27 · 2021-07-21T09:56:06Z

src/frontend/ocamlmerlin/ocamlmerlin.c

+  char * user_sid_string = retrieve_user_sid_string();
+
+  if (! user_sid_string)
+  {
+    user_sid_string = LocalAlloc(LPTR, 1);
+    user_sid_string[0] = '\0';
+  }
+


Note that LPTR explicitly zeros the memory, so there's no need to assign \0 afterwards.

I don't know how much it matters these days, but there are still supported versions of MSVC which require C90 variables at the start of blocks. I'd put LPSTR user_sid_string below #ifdef _WIN32 above and then:

Suggested change

char * user_sid_string = retrieve_user_sid_string();

if (! user_sid_string)

{

user_sid_string = LocalAlloc(LPTR, 1);

user_sid_string[0] = '\0';

}

/* user_sid_string is either the sid, or `""` and needs `LocalFree`ing */

user_sid_string = retrieve_user_sid_string() || LocalAlloc(LPTR, 1);

voodoos · 2021-07-21T11:56:03Z

@ttamttam : I just enabled Windows CI on master. It should run once you rebase your PR. The CI builds the binaries and run a subset of the test suite.

ttamttam · 2021-07-21T18:51:36Z

@ttamttam : I just enabled Windows CI on master. It should run once you rebase your PR. The CI builds the binaries and run a subset of the test suite.

👍

ttamttam · 2021-07-21T19:45:21Z

@dra27 @voodoos
Thanks for the detailed review.
It seems the CI workflows were triggered, but need to be approved.

On windows, if the username retrieved by `GetUserName` contain spaces, they end up in the socketname, and emacs fails when trying to open it.

- Created a retrieve_user_sid_string function. - compiles on my windows VM - checked that 'eventname' contains an user SID

voodoos · 2021-07-23T09:03:31Z

Thank you for your contribution @ttamttam !

…_pipe Replace user names by their SIDs in socketnames on Windows

Replace user names by their SIDs in socketnames on Windows

@ttamttam

CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)

@ttamttam

CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)

@ttamttam

CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)

@ttamttam

CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)

@ttamttam

CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359)

@ttamttam

CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)

@ttamttam

CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318)

@ttamttam

CHANGES: Mon Jul 26 11:13:37 AM CET 2021 + merlin binary - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes to show more or less deep results. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359)

@ttamttam

CHANGES: Mon Jul 26 04:45:37 PM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` can be use to change the depth of the recursive construction. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318) - disable tests failing in Opam's CI due to nested dune projects (ocaml/merlin#1373)

@ttamttam

CHANGES: Mon Jul 26 04:45:37 PM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` can be use to change the depth of the recursive construction. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318) - disable tests failing in Opam's CI due to nested dune projects (ocaml/merlin#1373)

@ttamttam

CHANGES: Mon Jul 26 04:43:37 PM CET 2021 + merlin binary - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) + test suite - disable tests failing in Opam's CI due to nested dune projects

@ttamttam

CHANGES: Mon Jul 26 04:45:37 PM CET 2021 + merlin binary - recover ill-typed patterns (ocaml/merlin#1317, ocaml/merlin#1342) - more accurate type-enclosing for methods (ocaml/merlin#1328, fixes ocaml/merlin#1124) - fix location of patterns in Occurrences (ocaml/merlin#1324, fixes ocaml/ocaml-lsp#375) - fix location of module definitions done via functors (ocaml/merlin#1329, fixes ocaml/merlin#1199) - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - add new module holes that can replace module expressions (ocaml/merlin#1333) - add a new command `construct` that builds a list of possible terms when called on a typed hole (ocaml/merlin#1318) - `refactor-open` improvements (ocaml/merlin#1313, ocaml/merlin#1314, ocaml/merlin#1366, ocaml/merlin#1372) - do not make paths absolute, simply prefix with the identifier under the cursor ```ocaml open Foo (* calling refactor-open qualify on this open *) let _ = Foo.bar (* previously could result in [Dune__exe.Foo.bar] *) ``` - do not return identical (duplicate) edits - do not return unnecessary edits that when applied do not change the document - handle record fields properly - handle multi-line paths - `unqualify` should not qualify - Handle `Persistent_env.Error` in `Typemod.initial_env` (ocaml/merlin#1355) - locate: reset global state from all entry points (ocaml/merlin#1364) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add a simple interface to the new `construct` command: `MerlinConstruct`. When several results are suggested, `<c-i>` and `<c-u>` can be use to change the depth of the recursive construction. (ocaml/merlin#1318) - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add a simple interface to the new `construct` command: `merlin-construct`. (ocaml/merlin#1352) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) - emacs: fix issue with `merlin--highlight` and various minor improvements (ocaml/merlin#1367, @mattiase) + test suite - cover the new `construct` command (ocaml/merlin#1318) - disable tests failing in Opam's CI due to nested dune projects (ocaml/merlin#1373)

@ttamttam

CHANGES: Mon Jul 26 04:43:37 PM CET 2021 + merlin binary - fix -cmt-path dirs mistakenly added to build path (ocaml/merlin#1330) - Windows: replace user name by its SID in socketnames (ocaml/merlin#1345, @ttamttam) + editor modes - vim: add support for the `merlin-locate-type` command: `MerlinLocateType` (ocaml/merlin#1359) - emacs: add support for the `merlin-locate-type` command. (ocaml/merlin#1359) + test suite - disable tests failing in Opam's CI due to nested dune projects

voodoos requested a review from let-def June 7, 2021 09:06

ttamttam mentioned this pull request Jun 7, 2021

dot-merlin not found: cygwin + emacs-w32 + fdopen's opam #599

Open

let-def approved these changes Jun 7, 2021

View reviewed changes

ttamttam requested a review from let-def June 20, 2021 12:54

dra27 reviewed Jun 21, 2021

View reviewed changes

src/frontend/ocamlmerlin/ocamlmerlin.c Outdated Show resolved Hide resolved

src/frontend/ocamlmerlin/ocamlmerlin.c Outdated Show resolved Hide resolved

src/frontend/ocamlmerlin/ocamlmerlin.c Outdated Show resolved Hide resolved

voodoos added this to the Release 4.3 / 3.6 milestone Jul 13, 2021

voodoos requested review from let-def and removed request for let-def July 13, 2021 15:25

trefis force-pushed the master branch from cf6700e to a8fa9db Compare July 13, 2021 17:14

dra27 reviewed Jul 21, 2021

View reviewed changes

ttamttam added 2 commits July 23, 2021 10:47

Replace spaces in socketname with '_'

57cd1b4

On windows, if the username retrieved by `GetUserName` contain spaces, they end up in the socketname, and emacs fails when trying to open it.

Replace user by SID

63e05cb

- Created a retrieve_user_sid_string function. - compiles on my windows VM - checked that 'eventname' contains an user SID

voodoos force-pushed the replace_spaces_in_windows_pipe branch from c1fc61f to 63e05cb Compare July 23, 2021 08:50

Update changes

8d9ae36

voodoos merged commit aa0e207 into ocaml:master Jul 23, 2021

voodoos added a commit to voodoos/merlin that referenced this pull request Jul 23, 2021

Merge pull request ocaml#1345 from ttamttam/replace_spaces_in_windows…

e4f312b

…_pipe Replace user names by their SIDs in socketnames on Windows

voodoos added a commit that referenced this pull request Jul 23, 2021

Merge pull request #1345 from ttamttam/replace_spaces_in_windows_pipe

70c71a1

Replace user names by their SIDs in socketnames on Windows

voodoos mentioned this pull request Jul 26, 2021

[new release] merlin 4.3 412, 4.3 411 and 3.6.0 ocaml/opam-repository#19124

Closed

voodoos mentioned this pull request Jul 26, 2021

[new release] merlin 4.3.1-412/411 and 3.6.1 ocaml/opam-repository#19128

Merged

	char * retrieve_user_sid_string()
	LPSTR retrieve_user_sid_string()

Conversation

ttamttam commented Jun 5, 2021

Uh oh!

let-def commented Jun 7, 2021

Uh oh!

ttamttam commented Jun 7, 2021

Uh oh!

let-def commented Jun 7, 2021

Uh oh!

let-def commented Jun 7, 2021

Uh oh!

ttamttam commented Jun 20, 2021

Uh oh!

dra27 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ttamttam commented Jun 21, 2021

Uh oh!

dra27 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

voodoos commented Jul 21, 2021

Uh oh!

ttamttam commented Jul 21, 2021

Uh oh!

ttamttam commented Jul 21, 2021

Uh oh!

voodoos commented Jul 23, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants