Plume
/
Plume
8
16
Fork 22
Code Issues 174 Pull-Requests 8 Releases 8 Wiki Aktivität

Label Meilensteine

Syntax highlighting #691

Zusammengeführt
epsilon-phase hat 12 Commits von syntax-highlighting nach master vor 4 Jahren zusammengeführt
Diskussion 4 Commits 12 Geänderte Dateien 11
epsilon-phase hat vor 5 Jahren kommentiert (Migriert von github.com)
Hier gibt es bis jetzt noch keinen Inhalt.
epsilon-phase hat vor 5 Jahren kommentiert (Migriert von github.com)

We aren't any good at the css or the styling.

Not to mention that it needs some more work on both the css classes generated accepted, and what needs to be highlighted.

Sublime/textmate syntaxes are rather intricate.

We aren't any good at the css or the styling. Not to mention that it needs some more work on both the css classes generated accepted, and what needs to be highlighted. Sublime/textmate syntaxes are rather intricate.
igalic hat vor 4 Jahren kommentiert (Migriert von github.com)

a general comment, if you want GitHub to properly credit you, you may wanna add the email from the commits to your github email addresses.

a general comment, if you want GitHub to properly credit you, you may wanna add the email from the commits to your github email addresses.
👍 1
elegaanz (Migriert von github.com) hat vor 4 Jahren überprüft
elegaanz (Migriert von github.com) hat einen Kommentar hinterlassen

Works fine overall, just a few remarks:

  • The .punctuation spans should probably be of the default text color (black/white depending on the theme)
  • The languages names are not obvious to guess, I had to print the list to know what names to use. A good improvement could be to make them lowercase, and replace non-alphabetic characters with - (for instance, HTML Erlang would become html-erlang). It would require you to write your own equivalent of find_syntax_by_name tho.

Here is the list of languages in case someone wants to see it:

"Plain Text",
"ASP",
"HTML (ASP)",
"ActionScript",
"AppleScript",
"Batch File",
"NAnt Build File",
"C#",
"C++",
"C",
"CSS",
"Clojure",
"D",
"Diff",
"Erlang",
"HTML (Erlang)",
"Go",
"Graphviz (DOT)",
"Groovy",
"HTML",
"Haskell",
"Literate Haskell",
"Java Server Page (JSP)",
"Java",
"JavaDoc",
"Java Properties",
"JSON",
"JavaScript",
"Regular Expressions (Javascript)",
"BibTeX",
"LaTeX Log",
"LaTeX",
"TeX",
"Lisp",
"Lua",
"Make Output",
"Makefile",
"Markdown",
"MultiMarkdown",
"MATLAB",
"OCaml",
"OCamllex",
"OCamlyacc",
"camlp4",
"Objective-C++",
"Objective-C",
"PHP Source",
"PHP",
"Pascal",
"Perl",
"Python",
"Regular Expressions (Python)",
"R Console",
"R",
"Rd (R Documentation)",
"HTML (Rails)",
"JavaScript (Rails)",
"Ruby Haml",
"Ruby on Rails",
"SQL (Rails)",
"Regular Expression",
"reStructuredText",
"Ruby",
"Cargo Build Results",
"Rust",
"SQL",
"Scala",
"Bourne Again Shell (bash)",
"Shell-Unix-Generic",
"commands-builtin-shell-bash",
"HTML (Tcl)",
"Tcl",
"Textile",
"XML",
"YAML"

Otherwise, it works fine as I said. Thank you!

Works fine overall, just a few remarks: - The `.punctuation` spans should probably be of the default text color (black/white depending on the theme) - The languages names are not obvious to guess, I had to print the list to know what names to use. A good improvement could be to make them lowercase, and replace non-alphabetic characters with `-` (for instance, `HTML Erlang` would become `html-erlang`). It would require you to write your own equivalent of `find_syntax_by_name` tho. Here is the list of languages in case someone wants to see it: <details> "Plain Text", "ASP", "HTML (ASP)", "ActionScript", "AppleScript", "Batch File", "NAnt Build File", "C#", "C++", "C", "CSS", "Clojure", "D", "Diff", "Erlang", "HTML (Erlang)", "Go", "Graphviz (DOT)", "Groovy", "HTML", "Haskell", "Literate Haskell", "Java Server Page (JSP)", "Java", "JavaDoc", "Java Properties", "JSON", "JavaScript", "Regular Expressions (Javascript)", "BibTeX", "LaTeX Log", "LaTeX", "TeX", "Lisp", "Lua", "Make Output", "Makefile", "Markdown", "MultiMarkdown", "MATLAB", "OCaml", "OCamllex", "OCamlyacc", "camlp4", "Objective-C++", "Objective-C", "PHP Source", "PHP", "Pascal", "Perl", "Python", "Regular Expressions (Python)", "R Console", "R", "Rd (R Documentation)", "HTML (Rails)", "JavaScript (Rails)", "Ruby Haml", "Ruby on Rails", "SQL (Rails)", "Regular Expression", "reStructuredText", "Ruby", "Cargo Build Results", "Rust", "SQL", "Scala", "Bourne Again Shell (bash)", "Shell-Unix-Generic", "commands-builtin-shell-bash", "HTML (Tcl)", "Tcl", "Textile", "XML", "YAML" </details> Otherwise, it works fine as I said. Thank you!
.circleci/images/plume-buildenv/Dockerfile
@ -6,3 +6,3 @@
apt install -y --no-install-recommends git ssh tar gzip ca-certificates default-jre&&\
apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-pip zip unzip &&\
apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-pip zip unzip libclang-dev&&\
rm -rf /var/lib/apt/lists/*
elegaanz (Migriert von github.com) hat vor 4 Jahren kommentiert

This new dependency should be added to the install docs too.

This new dependency should be added to the install docs too.
assets/themes/default/_variables.scss
elegaanz (Migriert von github.com) hat vor 4 Jahren kommentiert

Still a TODO or not?

Still a `TODO` or not?
plume-common/src/utils.rs
elegaanz (Migriert von github.com) hat vor 4 Jahren kommentiert

I think this line was for debugging, but it should probably be removed.

I think this line was for debugging, but it should probably be removed.
plume-common/src/utils.rs
elegaanz (Migriert von github.com) hat vor 4 Jahren kommentiert

Maybe you can chain the two scan calls without calling into_iter between.

Maybe you can chain the two `scan` calls without calling `into_iter` between.
plume-models/src/safe_string.rs
@ -34,0 +35,4 @@
"span",
[
"cw-container",
"cw-text",
elegaanz (Migriert von github.com) hat vor 4 Jahren kommentiert

Are these lines needed? They don't seem to be related to syntax highlighting and were not here before.

Are these lines needed? They don't seem to be related to syntax highlighting and were not here before.
epsilon-phase (Migriert von github.com) hat vor 4 Jahren überprüft
plume-common/src/utils.rs
epsilon-phase (Migriert von github.com) hat vor 4 Jahren kommentiert

We can't think of an easy way to allow that, since it would have to be carrying state between adjacent Option<Vec<Event>>s

We can't think of an easy way to allow that, since it would have to be carrying state between adjacent `Option<Vec<Event>>`s
epsilon-phase (Migriert von github.com) hat vor 4 Jahren überprüft
assets/themes/default/_variables.scss
epsilon-phase (Migriert von github.com) hat vor 4 Jahren kommentiert

There could be more variables/highlighting to consider, but we're not much for that, so we'll take it out if you prefer.

There could be more variables/highlighting to consider, but we're not much for that, so we'll take it out if you prefer.
epsilon-phase (Migriert von github.com) hat vor 4 Jahren überprüft
plume-models/src/safe_string.rs
@ -34,0 +35,4 @@
"span",
[
"cw-container",
"cw-text",
epsilon-phase (Migriert von github.com) hat vor 4 Jahren kommentiert

Those are from the cw'd media stuff, but, since we merged it not quite right, that call was duplicated later on in the builder chain.

Those are from the cw'd media stuff, but, since we merged it not *quite* right, that call was duplicated later on in the builder chain.
trinity-1686a hat vor 4 Jahren überprüft
plume-common/src/utils.rs
trinity-1686a hat vor 4 Jahren kommentiert
Besitzer

not trying to use scan a second time, but flatten would look better than flat_map(into_iter)

not trying to use scan a second time, but [`flatten`](https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.flatten) would look better than `flat_map(into_iter)`
codecov[bot] hat vor 4 Jahren kommentiert (Migriert von github.com)

Codecov Report

Merging #691 into master will decrease coverage by 0.02%.
The diff coverage is 32.43%.

@@            Coverage Diff            @@
##           master    #691      +/-   ##
=========================================
- Coverage   39.32%   39.3%   -0.03%     
=========================================
  Files          72      72              
  Lines        9497    9534      +37     
  Branches     2265    2275      +10     
=========================================
+ Hits         3735    3747      +12     
- Misses       4697    4714      +17     
- Partials     1065    1073       +8
# [Codecov](https://codecov.io/gh/Plume-org/Plume/pull/691?src=pr&el=h1) Report > Merging [#691](https://codecov.io/gh/Plume-org/Plume/pull/691?src=pr&el=desc) into [master](https://codecov.io/gh/Plume-org/Plume/commit/597778fd2f86139eb92ff54ea95229603d5215a9?src=pr&el=desc) will **decrease** coverage by `0.02%`. > The diff coverage is `32.43%`. ```diff @@ Coverage Diff @@ ## master #691 +/- ## ========================================= - Coverage 39.32% 39.3% -0.03% ========================================= Files 72 72 Lines 9497 9534 +37 Branches 2265 2275 +10 ========================================= + Hits 3735 3747 +12 - Misses 4697 4714 +17 - Partials 1065 1073 +8 ```
epsilon-phase (Migriert von github.com) hat vor 4 Jahren überprüft
plume-common/src/utils.rs
epsilon-phase (Migriert von github.com) hat vor 4 Jahren kommentiert

You mean like this?

.scan(None,flatten_text)
.flatten()
.scan(None,highlight_code)
You mean like this? ``` .scan(None,flatten_text) .flatten() .scan(None,highlight_code) ```
trinity-1686a hat vor 4 Jahren überprüft
plume-common/src/utils.rs
trinity-1686a hat vor 4 Jahren kommentiert
Besitzer

yes, and even

.scan(None,flatten_text)
.flatten()
.scan(None,highlight_code)
.flatten()
yes, and even ```rust .scan(None,flatten_text) .flatten() .scan(None,highlight_code) .flatten() ```
epsilon-phase (Migriert von github.com) hat vor 4 Jahren überprüft
plume-common/src/utils.rs
epsilon-phase (Migriert von github.com) hat vor 4 Jahren kommentiert

Can-do :)

Can-do :)
elegaanz (Migriert von github.com) hat vor 4 Jahren überprüft
assets/themes/default/_variables.scss
elegaanz (Migriert von github.com) hat vor 4 Jahren kommentiert

As you want.

As you want.
elegaanz (Migriert von github.com) hat die Änderungen vor 4 Jahren genehmigt
elegaanz (Migriert von github.com) hat einen Kommentar hinterlassen

Works great, thank you!

Works great, thank you!
igalic hat vor 4 Jahren kommentiert (Migriert von github.com)

\o/

\o/

Reviewer

elegaanz
Der Pull Request wurde als 458baf5f78 gemergt.
Siehe auch die Anleitung für die Kommandozeile.

Schritt 1:

Wechsle auf einen neuen Branch in deinem lokalen Repository und teste die Änderungen.
git checkout -b syntax-highlighting master
git pull origin syntax-highlighting

Schritt 2:

Führe die Änderungen zusammen und aktualisiere den Stand online auf Forgejo.
git checkout master
git merge --no-ff syntax-highlighting
git push origin master
Anmelden, um an der Diskussion teilzunehmen.
Reviewer
Überprüfung anfordern
Keine Reviewer
elegaanz
Label
Label anwenden
Label entfernen   
A: API

Related to the REST API   
A: Backend

Code running on the server   
A: Federation

Stuff related to Federation   
A: Front-End

Related to the front-end   
A: I18N

Translations, and related code   
A: Meta

More about project management or code than the project itself   
A: Security
   
Build

The building, or installation process of Plume   
C: Bug

Something isn't working   
C: Discussion

We need to talk   
C: Enhancement

New feature or request   
C: Feature

This is a new feature   
Compatibility

Compatibility with different browsers, readers and OS   
Dependency

Related to an external package that Plume uses   
Design

UI/UX related issues and PRs   
Documentation
   
Good first issue

Good for newcomers   
Help welcome

Extra attention is needed   
Mobile

Issues affecting only mobile UX   
Rendering

How elements're rendered out for the end user   
S: Blocked

Something else needs to be fixed first   
S: Duplicate

This issue or pull request already exists   
S: Incomplete

This PR is not complete yet   
S: Instance specific

Issues concern a limited number of instances   
S: Invalid

This doesn't seem right   
S: Needs Voting/Discussion

Need to be discussed by the community (on Loomio)   
S: Ready for review

This PR is ready to be reviewed   
Suggestion

Proposed ideas worth considering   
S: Voted on Loomio

This is issue has been created after a vote on Loomio   
S: Wontfix

This will not be worked on
Kein Label
A: API
A: Backend
A: Federation
A: Front-End
A: I18N
A: Meta
A: Security
Build
C: Bug
C: Discussion
C: Enhancement
C: Feature
Compatibility
Dependency
Design
Documentation
Good first issue
Help welcome
Mobile
Rendering
S: Blocked
S: Duplicate
S: Incomplete
S: Instance specific
S: Invalid
S: Needs Voting/Discussion
S: Ready for review
Suggestion
S: Voted on Loomio
S: Wontfix
Meilenstein
Meilenstein setzen
Meilenstein entfernen
Keine Einträge
Kein Meilenstein
Zuständig
Benutzer zuweisen
Zuständige entfernen
Niemand zuständig
2 Beteiligte
Nachrichten
Fällig am
Das Fälligkeitsdatum ist ungültig oder außerhalb des zulässigen Bereichs. Bitte verwende das Format „jjjj-mm-tt“.

Kein Fälligkeitsdatum gesetzt.

Abhängigkeiten

Keine Abhängigkeiten gesetzt.

Referenz: Plume/Plume#691
Verfassen Vorschau
Laden…
Abbrechen
Speichern
Hier gibt es bis jetzt noch keinen Inhalt.
Branch „syntax-highlighting“ löschen

Das Löschen eines Branches ist permanent. Es KANN NICHT rückgängig gemacht werden. Fortfahren?

Abbrechen
Ja