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

upstream merge #9

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open

upstream merge #9

wants to merge 67 commits into from

Conversation

kaue
Copy link

@kaue kaue commented Jun 13, 2021

would be nice to have some of those bugfixes merged into this fork.
@josteink can you check if there is anything useful?

23 commits behind the upstream and has conflicts that must be resolved.

YorkZ and others added 23 commits November 17, 2016 13:03
Previously, if the inferior process buffer is not being shown in any
window, one would have to manually bring it up after evaluating an
expression in order to see the results. With this change, the inferior
process buffer will always be displayed after evaluating an expression
so that one can alway see the results without having to bring up the
inferior process buffer.
Always display inferior process buffer after evaluation
I am very sorry... I just typed a typo...
This closes #24.
defining our adjust-window-size-function
@josteink
Copy link
Member

Seems like quite a bit of things have diverged since I made my small fork, and that merging won't be trivial.

I'm definitely not against trying to better align with a new upstream version, but I'm not sure I will have time to follow this closely any day soon.

If you could help try to resolve some of the merge-conflicts, I could probably more easily review this PR and see if I think the changes makes sense for this project too :)

@kaue
Copy link
Author

kaue commented Jun 14, 2021

Indeed this seems like a quite difficult merge to make. I may try to help with a couple of merges, but i don't think have the required knowledge in this code base / elisp for this task.

But yeah, this would be a great effort so we can continue merging with the upstream getting new features / bugfixes :)

@josteink
Copy link
Member

GitHub says there’s conflicts which needs to be resolved. Are you looking into that? 🙂

joshbax189 and others added 30 commits October 17, 2024 10:53
This means that default-directory is always added to NODE_PATH
when calling js-comint-repl
This avoids modifying NODE_PATH for later calls
Made cmd optional and documented behaviour.
read-directory-name defaults to default-directory if nil
and expand-file-name produces output equivalent to file-truename.
This way js-rest-repl does not "forget" the local node_modules.
This fixes byte-compiler warnings, but keeps nvm optional
js-comint-select-node-version is the common entry point when using
nvm functions.
Add gitignore
Remove unused script files
Feat: use eask package manager
Squashed commit of the following:

commit 479eb46
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Dec 3 16:41:38 2024 -0800

    Fix: use emacs 28 compat completion fns in test

commit 5870d05
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Dec 3 16:17:33 2024 -0800

    Fix: avoid Eask issue to unblock tests

commit 19446fd
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Dec 3 10:51:17 2024 -0800

    Tidy comments and docstrings

commit af87be0
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Dec 3 10:41:40 2024 -0800

    Fix do not pass arguments to callback

commit ee0824b
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Dec 3 15:23:16 2024 -0800

    Add Capf tests

    * test/capf-tests.el: C

commit 9fcb825
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Dec 2 17:50:10 2024 -0800

    Move tests into own folder and separate files

    This allows separate loading of company and CAPE

commit bd2616b
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Dec 3 15:17:17 2024 -0800

    Native capf

commit 5d67b6b
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Nov 27 11:22:20 2024 -0800

    Use string-match-p to support 28

commit 9f1241f
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Nov 27 11:03:56 2024 -0800

    Cleanup hung callbacks when completing props of null object

commit 8937577
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Nov 26 12:45:12 2024 -0800

    Quote string when used as regexp in callback

commit e276f26
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Nov 26 11:46:38 2024 -0800

    Address fast-typing bug: extra input when callbacks overlap

commit 4353c89
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Nov 26 10:28:00 2024 -0800

    Use ert-async for tests with checks in callbacks

    Update test-company-complete-long-line

commit 44f2eac
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Nov 25 12:32:37 2024 -0800

    Fix matching bug in complete-substring

commit bb479f5
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Nov 25 11:34:27 2024 -0800

    Remove unused completion string property

commit ea7a9fd
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Nov 25 10:28:29 2024 -0800

    Fix: minor formatting change

commit 2ae491d
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Oct 28 22:35:16 2024 -0700

    Cleanup completion buffers

commit e07de7b
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Oct 28 22:22:11 2024 -0700

    Pass NODE_REPL_MODE as argument due to custom env

    Env var has no effect for some reason

commit b649559
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Oct 28 22:19:17 2024 -0700

    Wiggle the cursor to produce a prompt and prevent hanging

    This makes most cases resolve with similar output too

commit 123c87d
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Oct 28 21:23:52 2024 -0700

    Add Company integration tests

commit 83f8a31
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Oct 28 19:37:40 2024 -0700

    Simplify process-completion-output

commit f80ca42
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Oct 28 19:24:50 2024 -0700

    Proactively clear partial completions

commit 672c28a
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Oct 28 16:08:57 2024 -0700

    Complete long statements by taking latest substring

commit 3e6863e
Author: Josh Bax <joshbax189@gmail.com>
Date:   Mon Oct 28 15:48:04 2024 -0700

    Don't complete at whitespace

commit 51ebba7
Author: Josh Bax <joshbax189@gmail.com>
Date:   Fri Oct 25 14:48:24 2024 -0700

    Add unit tests for listener callback code

commit 4157796
Author: Josh Bax <joshbax189@gmail.com>
Date:   Fri Oct 25 14:42:12 2024 -0700

    Recover from errors in company callbacks after completion

commit 0ed6d0b
Author: Josh Bax <joshbax189@gmail.com>
Date:   Fri Oct 25 14:12:50 2024 -0700

    Set TERM using env

    Remove with-environment-variables because it must be set within the
    comint call. Move other vars into the same location.

commit aa38210
Author: Josh Bax <joshbax189@gmail.com>
Date:   Fri Oct 25 10:22:44 2024 -0700

    Failed callbacks should be removed

commit 5b3efea
Author: Josh Bax <joshbax189@gmail.com>
Date:   Fri Oct 25 09:45:53 2024 -0700

    Factor out callback active test

commit 67208a6
Author: Josh Bax <joshbax189@gmail.com>
Date:   Thu Oct 24 23:11:50 2024 -0700

    Add retry counter for method completion

commit 9433d55
Author: Josh Bax <joshbax189@gmail.com>
Date:   Thu Oct 24 23:11:38 2024 -0700

    Factor out callback creation

commit dd0a5e5
Author: Josh Bax <joshbax189@gmail.com>
Date:   Thu Oct 24 13:08:07 2024 -0700

    Rewrite completions to use listener pattern callback

commit 83e3509
Author: Josh Bax <joshbax189@gmail.com>
Date:   Thu Oct 24 13:02:45 2024 -0700

    Rename company-js-comint-backend => company-js-comint

    Matches other backend names

commit 74592d5
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Oct 22 23:56:41 2024 -0700

    Don't use comint-send-string for invisible input

commit 4816ab3
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Oct 22 23:50:09 2024 -0700

    Inline company definition in should-complete

commit c6cbbda
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Oct 22 12:48:22 2024 -0700

    Use 28.1 compatible kill-matching-buffers in test

commit bb64f53
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Oct 22 12:36:52 2024 -0700

    Add should-complete unit tests

    Add Eask file

commit 0dc206a
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Oct 22 11:23:47 2024 -0700

    Add test macro with-new-js-comint-buffer and simplify tests

    Kills comint buffer between runs for safety

commit 054c097
Author: Josh Bax <joshbax189@gmail.com>
Date:   Sun Oct 20 11:42:37 2024 -0700

    Add unload function to remove company backend

commit 96cf5a7
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Oct 16 16:32:28 2024 -0700

    Unit tests for normal completion

commit 2721fd8
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Oct 16 16:24:30 2024 -0700

    Use js-comint-get-process

commit f2f3d65
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Oct 16 15:50:56 2024 -0700

    Do not take arguments for js-comint--discard-output when a callback

commit 7829fac
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Oct 16 15:41:30 2024 -0700

    Discard should apply to all output until control char

commit 6e274c8
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Oct 16 15:35:53 2024 -0700

    Add unit tests for js-comint--process-completion-output

commit 5b50ada
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Oct 16 13:32:57 2024 -0700

    Properly complete method names

commit 7f57d76
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Oct 16 11:12:29 2024 -0700

    Factor out completion processing logic

commit a98dc6e
Author: Josh Bax <joshbax189@gmail.com>
Date:   Wed Oct 16 09:15:20 2024 -0700

    Simplify handler logic

commit f182a52
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Oct 15 15:30:25 2024 -0700

    Completion handler with debug messages

commit 18ff4f6
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Oct 15 13:43:59 2024 -0700

    Filter completion output when a flag is set

commit 1cfedc9
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Oct 15 10:13:52 2024 -0700

    Get input for completion

commit 1352dbf
Author: Josh Bax <joshbax189@gmail.com>
Date:   Tue Oct 15 09:01:49 2024 -0700

    Add stub for company-js-comint-backend and init code
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.

9 participants