Skip to content

Allow the _ character in property names #4

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

Merged
aviav merged 2 commits into from
Jul 1, 2019
Merged

Allow the _ character in property names #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d133cab
Allow _ in property names
cro Jun 13, 2019
094e81f
Enhance test to check for valid _ in property name
cro Jun 14, 2019
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 lib/org/lexer.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ defmodule Org.Lexer do
@empty_line_re ~r/^\s*$/
@table_row_re ~r/^\s*(?:\|[^|]*)+\|\s*$/
@begin_props_re ~r/^\s*\:PROPERTIES\:$/
@property_re ~r/^\s*\:([A-Za-z]+)\:\s*(.+)$/
@property_re ~r/^\s*\:([A-Za-z_]+)\:\s*(.+)$/
@end_drawer_re ~r/^\s*\:END\:$/

defp lex_line(line, %Org.Lexer{mode: :normal} = lexer) do
Expand Down
1 change: 1 addition & 0 deletions test/org/lexer_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ defmodule Org.LexerTest do
{:property, "Artist", "Glenn Gould"},
{:property, "Publisher", "Deutsche Grammophon"},
{:property, "NDisks", "1"},
{:property, "ARCHIVE_TIME", "2018-08-14 Tue 16:39"},
{:end_drawer},
{:text, "3"},
{:section_title, 4, "is nesting"},
Expand Down
1 change: 1 addition & 0 deletions test/org/parser_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ defmodule Org.ParserTest do
{:Artist, "Glenn Gould"},
{:Publisher, "Deutsche Grammophon"},
{:NDisks, "1"},
{:ARCHIVE_TIME, "2018-08-14 Tue 16:39"},
]
end
end
Expand Down
11 changes: 6 additions & 5 deletions test/org_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ defmodule OrgTest do
2
*** thing
:PROPERTIES:
:Title: Goldberg Variations
:Composer: J.S. Bach
:Artist: Glenn Gould
:Publisher: Deutsche Grammophon
:NDisks: 1
:Title: Goldberg Variations
:Composer: J.S. Bach
:Artist: Glenn Gould
:Publisher: Deutsche Grammophon
:NDisks: 1
:ARCHIVE_TIME: 2018-08-14 Tue 16:39
:END:
3
**** is nesting
Expand Down