Skip to content
This repository has been archived by the owner on Dec 28, 2021. It is now read-only.

Applies fixes for Doc Parser. #1098

Merged
merged 36 commits into from
Feb 11, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
cfff007
doc bump
BinarySoftware Jan 8, 2021
8f4c38e
bump parser
BinarySoftware Jan 8, 2021
2afecf3
wrap
BinarySoftware Jan 8, 2021
6832228
indent
BinarySoftware Jan 8, 2021
630000d
bacl
BinarySoftware Jan 8, 2021
17af7b4
Merge remote-tracking branch 'origin/main' into wip/mm/doc-parser-bump
BinarySoftware Jan 25, 2021
a31f4da
update parwer
BinarySoftware Feb 2, 2021
48ec848
Merge remote-tracking branch 'origin/develop' into wip/mm/doc-parser-…
BinarySoftware Feb 2, 2021
cd83fb7
try
BinarySoftware Feb 2, 2021
039efed
boi it works
BinarySoftware Feb 4, 2021
331be55
rm
BinarySoftware Feb 4, 2021
31038f1
up
BinarySoftware Feb 5, 2021
316be76
Merge remote-tracking branch 'origin/develop' into wip/mm/doc-parser-…
BinarySoftware Feb 5, 2021
712f440
size
BinarySoftware Feb 5, 2021
bb8b27e
save
BinarySoftware Feb 5, 2021
30797f7
try a thing
BinarySoftware Feb 5, 2021
13011c2
rm
BinarySoftware Feb 5, 2021
5581a42
rm
BinarySoftware Feb 5, 2021
6bb9aea
revert
BinarySoftware Feb 5, 2021
d6adb76
update CHANGELOG.md
BinarySoftware Feb 5, 2021
34c1752
Merge branch 'develop' into wip/mm/doc-parser-bump
wdanilo Feb 5, 2021
902948f
update CHANGELOG.md
BinarySoftware Feb 8, 2021
86b0e81
Merge remote-tracking branch 'origin/wip/mm/doc-parser-bump' into wip…
BinarySoftware Feb 8, 2021
38080e1
update CHANGELOG.md
BinarySoftware Feb 8, 2021
1b176f4
update CHANGELOG.md
BinarySoftware Feb 8, 2021
65c4e4b
updates - review
BinarySoftware Feb 8, 2021
5e339c3
rm hack
BinarySoftware Feb 9, 2021
4850d57
up
BinarySoftware Feb 9, 2021
750c18f
up
BinarySoftware Feb 9, 2021
ee43b12
up
BinarySoftware Feb 9, 2021
798f760
Update CHANGELOG.md
BinarySoftware Feb 9, 2021
c417140
rev
BinarySoftware Feb 10, 2021
ab48a06
Merge remote-tracking branch 'origin/develop' into wip/mm/doc-parser-…
BinarySoftware Feb 10, 2021
0324982
Log update
BinarySoftware Feb 11, 2021
5c8f727
try lower
BinarySoftware Feb 11, 2021
d238968
revert
BinarySoftware Feb 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rust/ide/lib/parser/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const PARSER_PATH: &str = "./pkg/scala-parser.js";
/// Commit from `enso` repository that will be used to obtain parser from.
/// FIXME: Using commit not from Engine's main branch but from a backported branch as the AST in
/// this project hasn't been updated to conform to latest scala parser (#732).
const PARSER_COMMIT: &str = "9d848fc59bfbab8aa202da71dc899759817dff0f";
const PARSER_COMMIT: &str = "92514b8567d51ce571e03be1f160f82204f469bc";

/// Magic code that needs to be prepended to ScalaJS generated parser due to:
/// https://github.com/scala-js/scala-js/issues/3677/
Expand Down
4 changes: 1 addition & 3 deletions src/rust/ide/view/src/documentation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,7 @@ impl Model {
Ok(PLACEHOLDER_STR.into())
} else {
let parser = parser::DocParser::new()?;
// FIXME [MM]: Removes characters that are not supported by Doc Parser yet.
// https://github.com/enso-org/enso/issues/1063
let processed = string.replace("\\n", "\n").replace("\"", "");
let processed = string.to_string();
let output = match input_type {
InputFormat::AST => parser.generate_html_docs(processed),
InputFormat::Docstring => parser.generate_html_doc_pure(processed),
Expand Down
2 changes: 2 additions & 0 deletions src/rust/ide/view/src/documentation/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
color: #333333;
margin: 0;
padding: 0;
width: 100%;
overflow-wrap: break-word;
}

.dark-theme .docVis {
Expand Down