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

Fix crlf end-of-line in FigFontFiles.scala #79

Merged
merged 1 commit into from
Jan 21, 2021

Conversation

domartynov
Copy link
Contributor

@domartynov domartynov commented Jan 10, 2021

@jdegoes somehow you've committed FigFontFiles.scala with CRLF, i wonder what's your git config core.autocrlf then (usually we keep text files with LF in the repo, right?). Either way, CRLF is expected on Windows, so i'm replacing .split('\n') with .linesItertor.toSql (@adamgfraser has added Chunk.fromIterator to zio, by it's not released yet).

Btw do we need zio-cli/shared/src/main/resources/slant.flf given FigFontFiles has it embedded?

@jdegoes
Copy link
Member

jdegoes commented Jan 21, 2021

@domartynov I will fix the CRLF (I only recently started using Windows).

I could not find a way to load the slant.flf file from resources. If you can do that, we can delete the embedding in Scala. I think we should have one or the other.

@jdegoes jdegoes merged commit 879580e into zio:master Jan 21, 2021
@domartynov
Copy link
Contributor Author

@domartynov I will fix the CRLF (I only recently started using Windows).

I could not find a way to load the slant.flf file from resources. If you can do that, we can delete the embedding in Scala. I think we should have one or the other.

@jdegoes I'll check. I tough you chose to embed in order to keep the code in the shared project, as I was only able to implement fromResource for JVM only (cannot find how resources are used in ScalaJS).

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.

2 participants