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

Support a text wrapping preference in the textview #105

Merged

Conversation

ben-p-commits
Copy link
Contributor

@ben-p-commits ben-p-commits commented Jan 6, 2023

Background

This addresses bug #84 , and fulfills some of the requirements of #66 (the rest of which will be implemented in CodeEdit in a nascent PR).

Technical Details

Two things to note:

  1. This will likely regress highlighting behavior- more detailed discussion available on this discord channel, but TLDR: @thecoolwinter has plans to obviate the need for the removed NSLayoutManager code when he migrates that work to TextKit 2.

  2. I went ahead and removed the invocation of STTextView's static scrollableTextView() helper function. It sets a number of properties which are immediately overwritten by our code in loadView(). It only obfuscates what's really happening here.

@ben-p-commits
Copy link
Contributor Author

linting issues noted. will address.

@ben-p-commits ben-p-commits marked this pull request as ready for review January 6, 2023 20:04
@lukepistrol
Copy link
Member

Let's just wait for the review of @thecoolwinter

Copy link
Collaborator

@thecoolwinter thecoolwinter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes look good, but I'd like to make sure we don't regress syntax highlighting in a release so let's merge this but wait to create a new release until syntax highlighting is back up and working.

@ben-p-commits
Copy link
Contributor Author

ben-p-commits commented Jan 11, 2023

@austincondiff , @lukepistrol - we should be all set to merge according to @thecoolwinter

I have the follow-on changes ready for CodeEdit.

@lukepistrol lukepistrol merged commit c3eb00c into CodeEditApp:main Jan 11, 2023
Copy link
Collaborator

@austincondiff austincondiff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@lukepistrol
Copy link
Member

I'll tag a new version in a couple of hours!

@lukepistrol
Copy link
Member

I just tagged the new release with 0.3.0

matthijseikelenboom added a commit that referenced this pull request Jan 12, 2023
# Description

This PR removes all references to `NSLayoutManager` and fixes syntax
highlighting after the regression in #105.

# Related Issues

N/A

# Checklist

- [x] I read and understood the [contributing
guide](https://github.com/CodeEditApp/CodeEdit/blob/main/CONTRIBUTING.md)
as well as the [code of
conduct](https://github.com/CodeEditApp/CodeEdit/blob/main/CODE_OF_CONDUCT.md)
- [x] My changes generate no new warnings
- [x] My code builds and runs on my machine
- [x] I documented my code
- [x] Review requested
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.

None yet

4 participants