Skip to content

Merge trunk into wip/codebase2 #1891

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 155 commits into from
Apr 26, 2021
Merged

Merge trunk into wip/codebase2 #1891

merged 155 commits into from
Apr 26, 2021

Conversation

mitchellwrosen
Copy link
Member

@mitchellwrosen mitchellwrosen commented Apr 26, 2021 •
edited
Loading

In preparing to merge #1871 I discovered some additional conflicts with trunk that should be resolved first.

pchiusano added 30 commits January 4, 2021 21:15
@pchiusano
adding an 'inLayout' flag to the parsing state of the lexer and stubb…
3c9858f 
…ed out the lexer changes
@pchiusano
WIP filling in lexer for new doc blocks. have basic structure in place
01431b7
@pchiusano
filled in some more leaf level elements
898847c
@pchiusano
general transclusion syntax
ad1ae5c
@pchiusano
Merge remote-tracking branch 'origin/trunk' into topic/doc2
5867f2e
@pchiusano
rejiggering spaces parsing to avoid incorrectly committing to finding…
5b4892b 
… another element
@pchiusano
Merge remote-tracking branch 'origin/trunk' into topic/doc2
00e9330
@pchiusano
backticks support, started testing
c42f594
@pchiusano
WIP debugging the lexer changes. fixed bug with space consumption
196689b
@pchiusano
WIP debugging: fix spacing issue that caused docs with multiple parag…
35c1bb9 
…raphs to not parse
@pchiusano
WIP debugging lexer changes. Section parsing, paragraphs, and transcl…
735badc 
…usion syntax all seem to work.

Hyperlink syntax is busted. No syntax for bulleted or numbered lists yet.
@pchiusano
fix hyperlink parsing
f264974
@pchiusano
bold and italic syntax a la markdown
d9c38a8
@pchiusano
verbatim syntax, inline and block forms
166c8cb
@pchiusano
block eval syntax and fenced code blocks
4fb4463
@pchiusano
bulleted list syntax a la markdown
8b2387b
@pchiusano
numbered lists syntax a la markdown
cf1bb9d
@pchiusano
Implement (untested) TermParser changes
c834904 
Found a decent way of expressing so there's not much duplication between lexer and parser.
Still todo: example syntax, and make names consistent between lexer and parser
Still todo: syntax for docs on top level bindings
@pchiusano
Wrap up draft of term parser changes.
786a7b1
@pchiusano
make lexer and parser consistent
63e5066 
had to change link syntax for types and @source elements, it has some bugs
@pchiusano
making sure to emit layout tokens after end of doc blocks
7cd65cb
@pchiusano
zany reordering function
09759ab
@pchiusano
fix bug with link parsing
736f602
@pchiusano
Allow anonymous docs before terms in file parser
804af84
@pchiusano
doc blocks aren't reordered differently than terms
3ad8c0d
@pchiusano
strikethrough
4f69ef2
@pchiusano
Everything is hooked up, debugging checkpoint with this file:
2b9d2d7 
unique[b7a4fb87e34569319591130bf3ec6e24c9955b6ae06b5f6895e908d58c3f6113] type Doc2
  = Word Text
  | Code Doc2
  | CodeBlock Text Doc2
  | Bold Doc2
  | Italic Doc2
  | Strikethrough Doc2
  -- style {{ myclass }} mydoc
  | Style Doc2 Doc2
  | Blockquote Doc2
  | Embed Any
  | Blankline
  | SectionBreak
  | Aside (Optional Doc2) Doc2
  -- callout icon title content
  | Callout (Optional Doc2) (Optional Doc2) Doc2
  | Folded Boolean Doc2 Doc2
  | Join [Doc2]
  | Paragraph [Doc2]
  | BulletedList [Doc2]
  | NumberedList Nat [Doc2]
  | ListItem Doc2 [Doc2]
  | Section Doc2 [Doc2]
  | Source [Either Link.Type Any]
  | NamedLink Doc2 Doc2
  | Link [Either Link.Type Any]
  | Signature [Any]
  | Example Nat Any
  | InlineSignature Any
  | InlineEval Any
  | Eval Any
  | Trace Any

syntax.doc = Join
syntax.doc.group = Join
syntax.doc.word = Word
syntax.doc.bold = Bold
syntax.doc.italic = Italic
syntax.doc.strikethrough = Strikethrough
syntax.doc.paragraph = Paragraph
syntax.doc.embedTermLink any =
  guid = "b7a4fb87e34569319591130bf3ec6e24"
  Right any
syntax.doc.embedTypeLink tl =
  guid = "b7a4fb87e34569319591130bf3ec6e24"
  Left tl
syntax.doc.source = Source
syntax.doc.signature = Signature
syntax.doc.inlineSignature = InlineSignature
syntax.doc.inlineEval = InlineEval
syntax.doc.inlineCode = Code
syntax.doc.codeBlock = CodeBlock
syntax.doc.example n a = Example n (Any a)
syntax.doc.link = Link
syntax.doc.transclude d =
  guid = "b7a4fb87e34569319591130bf3ec6e24"
  d
syntax.doc.namedLink = NamedLink
syntax.doc.bulletedList = BulletedList
syntax.doc.numberedList = NumberedList
syntax.doc.listItem = ListItem
syntax.doc.section = Section

doc1 = {{ Hello, world! }}

---

  /Users/pchiusano/unison/scratch.u:64:8:
  unexpected syntax.doc
     64 | doc1 = {{ Hello, world! }}
@pchiusano
WIP debugging lexer/parser interaction. This parses now:
0ced52b 
doc1 = {{
__Hello__, world!

__Also see:__

1. Hi
2. Bye

- A
- B
- C
  + D
  + E
    - F
  + [Unison](https://unisonweb.org)

}}

Haven't tested most of the other syntax, and spotted at least one issue with term and type link parsing
---

unique[b7a4fb87e34569319591130bf3ec6e24c9955b6ae06b5f6895e908d58c3f6113] type Doc2
  = Word Text
  | Code Doc2
  | CodeBlock Text Doc2
  | Bold Doc2
  | Italic Doc2
  | Strikethrough Doc2
  -- style {{ myclass }} mydoc
  | Style Doc2 Doc2
  | Blockquote Doc2
  | Embed Any
  | Blankline
  | SectionBreak
  | Aside (Optional Doc2) Doc2
  -- callout icon title content
  | Callout (Optional Doc2) (Optional Doc2) Doc2
  | Folded Boolean Doc2 Doc2
  | Paragraph [Doc2]
  | BulletedList [Doc2]
  | NumberedList Nat [Doc2]
  | Section Doc2 [Doc2]
  | Source [Either Link.Type Any]
  | NamedLink Doc2 Doc2
  | Link [Either Link.Type Any]
  | Signature [Any]
  | Example Nat Any
  | InlineSignature Any
  | InlineEval Any
  | Eval Any
  | Trace Any
  | Docs [Doc2]

syntax.doc.docs = cases [d] -> d
                        ds -> Docs ds
syntax.doc.word = Word
syntax.doc.bold = Bold
syntax.doc.italic = Italic
syntax.doc.strikethrough = Strikethrough
syntax.doc.paragraph = Paragraph
syntax.doc.embedTermLink any =
  guid = "b7a4fb87e34569319591130bf3ec6e24"
  Right any
syntax.doc.embedTypeLink tl =
  guid = "b7a4fb87e34569319591130bf3ec6e24"
  Left tl
syntax.doc.source = Source
syntax.doc.signature = Signature
syntax.doc.inlineSignature = InlineSignature
syntax.doc.inlineEval = InlineEval
syntax.doc.inlineCode = Code
syntax.doc.codeBlock = CodeBlock
syntax.doc.example n a = Example n (Any a)
syntax.doc.link = Link
syntax.doc.transclude d =
  guid = "b7a4fb87e34569319591130bf3ec6e24"
  d
syntax.doc.namedLink = NamedLink
syntax.doc.bulletedList = BulletedList
syntax.doc.numberedList = NumberedList
syntax.doc.section = Section
@pchiusano
started on sample file to exercise all the doc2 syntax, fixed several…
e8b6df0 
… bugs in the process
@pchiusano
fix bug with non-Unison fenced code blocks
c439511
pchiusano and others added 22 commits April 14, 2021 15:29
@pchiusano
Text alignment functions are no longer builtin
73b9eb1
@pchiusano
Added a few comments and tweaked formatting
494ed7c
@mergify
Merge pull request #1853 from unisonweb/topic/doc2a
477371b 
New documentation format
@runarorama
Update to fzf 3
b92f041
@runarorama
Merge branch 'trunk' of github.com:unisonweb/unison into topic/fzf-en…
b437e09 
…dpoint
@runarorama
Consistent field naming
8fab375
@runarorama
Add generated cabal files
fb97726
@runarorama
revert some useless changes
64deff7
@runarorama
Merge pull request #1865 from unisonweb/topic/fzf-endpoint
5b3e7f1 
Add an endpoint for codebase search
@runarorama
Don't wait for CTRL-D before starting up server
ab9845a
@runarorama
Simplify
e0a008f
@runarorama
Merge pull request #1872 from unisonweb/topic/serverenv
b0dd6e5 
Don't wait for CTRL-D before starting up server
@runarorama
Fixes #1878
404196b
@pchiusano
Merge pull request #1879 from unisonweb/topic/serverenv
70eb992 
Don't ignore UCM_PORT environment variable
@runarorama
Add term tags and type tags to definitions
1350371
@mergify
Merge pull request #1883 from unisonweb/topic/defntags
efe0e12 
Add term tags and type tags to GetDefinitions endpoint
@runarorama
Add an option to suffixify binding names in defs
2782d52
@runarorama
Always suffixify types and terms on the server.
9a7a1fd
@runarorama
Make suffixification optional
1063708
@runarorama
Merge branch 'trunk' of github.com:unisonweb/unison into topic/suffix…
e77f77b 
…ifiedbindings
@mergify
Merge pull request #1885 from unisonweb/topic/suffixifiedbindings
65a8ff8 
Suffixify binding names in the definitions API
⅄ trunk → codebase2-merge-trunk
f4e353f
@mitchellwrosen
Copy link
Member Author

mitchellwrosen commented Apr 26, 2021 •
edited
Loading

Hmm, I thought there was a way of showing how conflicts were resolved on GitHub, but I can't find it now. A screenshot will have to do (or, to see locally, git show f4e353f925be1b0e32193877b09901ef65186583)

Screen Shot 2021-04-25 at 8 52 57 PM

When resolving the conflict in Main.hs I did think it was odd that the call to launch was dedented in wip/codebase2, to which I added the conflicting logging line above. However, reflecting on that, I now think it was originally just a misleading 3-way diff, because the encapsulating Server.start above (causing everything below to be indented more) was simply not part of the conflict.

Here's a screenshot of the original conflict for clarification:

Screen Shot 2021-04-25 at 9 10 51 PM

@mitchellwrosen
Copy link
Member Author

Fixed that here 722ae5a

@mitchellwrosen mitchellwrosen mentioned this pull request Apr 26, 2021
Merged
@aryairani aryairani merged commit 774a6a2 into wip/codebase2 Apr 26, 2021
@aryairani aryairani deleted the codebase2-merge-trunk branch April 26, 2021 16:20
@pchiusano pchiusano mentioned this pull request May 11, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aryairani aryairani Awaiting requested review from aryairani

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@mitchellwrosen @aryairani @pchiusano @runarorama @dolio