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.

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

Fix inside_block inclusion with multiple curly brackets on the same line #14

Closed
wants to merge 29 commits into from
Closed

Fix inside_block inclusion with multiple curly brackets on the same line #14

wants to merge 29 commits into from

Conversation

dmitry-timofeev
Copy link
Contributor

@dmitry-timofeev dmitry-timofeev commented Mar 12, 2020 •
edited
Loading

Commits to review: 05bb3d4...8540916

dmitry-timofeev and others added 28 commits February 14, 2020 18:25
@dmitry-timofeev
Add a Travis CI integration:
71a65a2 
Added a Travis CI script.

Also added the requirements.txt file, after
mkdocs & nose installation.
@dmitry-timofeev
Add support for any language:
da8c831 
Use the file extension as the language class for
highlight.js appears to support file extensions as language
classes, see: https://github.com/highlightjs/highlight.js#supported-languages
@dmitry-timofeev
Use the language alias from pygments instead
cb29dd5 
It must be more accurate than the file extension.
@dmitry-timofeev
Remove Travis CI integration
78cec4f
@dmitry-timofeev
Update requirements.txt according to the recommendations for libraries:
fe0d3f9 
Dependencies are specified in the setup.py,
and could be resolved from here.
See:
https://pip.pypa.io/en/stable/user_guide/#requirements-files
and https://caremad.io/posts/2013/07/setup-vs-requirement/
@dmitry-timofeev
Merge branch 'add-travis-ci' into develop
bb93f54
@dmitry-timofeev
Allow empty title:
5363117 
Allow empty title for code snippets. It may
be useful for short code fragments.
@rnorth @dmitry-timofeev
Import the documentation from the testcontainers project:
60f6e7b 
The documentation is imported from
testcontainers/testcontainers-java@fbf5092

See https://github.com/testcontainers/testcontainers-java/blob/master/docs/contributing_docs.md#codeincludes
and
https://github.com/testcontainers/testcontainers-java/blob/master/LICENSE
@dmitry-timofeev
Slightly extend the docs.
1724962
@dmitry-timofeev
Add docs on building the project
4311305
@dmitry-timofeev
Merge branch 'add-documentation' into develop
02e811f
@dmitry-timofeev
Add matching curly braces
1d50805
@dmitry-timofeev
Add installation instructions
d07e854
@dmitry-timofeev
Merge branch 'add-documentation' into develop
f47e446
@dmitry-timofeev
Document how to include the whole file
8a11dee
@dmitry-timofeev
Merge branch 'add-documentation' into develop
7f4e3b1
@dmitry-timofeev
Always use UTF-8:
470f49e 
Always use UTF-8 as it is commonly used
for platform-independent source files.
@dmitry-timofeev
Merge branch 'always-use-utf-8' into develop
8245430
@dmitry-timofeev
Add (one failing) tests for selectors
8b31639
@dmitry-timofeev
Add find_code_include_blocks (with two inner loops)
765c31d
@dmitry-timofeev
Rewrite find_code_include_blocks (with a flag and single loop)
facd249
@dmitry-timofeev
Add test with no includes
536fdab
@dmitry-timofeev
Support targeting expression on next line
108ec93
@dmitry-timofeev
Add some comments
7fa82ec
@dmitry-timofeev
Merge branch 'allow-selectors-on-next-line' into develop
3b77dd2
@dmitry-timofeev
Add a failing test for code containing right-curly
05bb3d4
@dmitry-timofeev
Fix inclusion with brackets on the same line
2979ea4
@dmitry-timofeev
Add a similar test for block
9916bd5
@dmitry-timofeev dmitry-timofeev changed the title Fix inside_block inclusion with multiple curly brackets on the same line [WIP] Fix inside_block inclusion with multiple curly brackets on the same line Mar 13, 2020
@dmitry-timofeev
Actually fix the inclusion inside_block:
8540916 
The fix in 2979ea4
was incomplete: see the added tests.
@dmitry-timofeev dmitry-timofeev changed the title [WIP] Fix inside_block inclusion with multiple curly brackets on the same line Fix inside_block inclusion with multiple curly brackets on the same line Mar 13, 2020
@raynigon raynigon mentioned this pull request Jun 6, 2020
Merged
@rnorth
Copy link
Owner

rnorth commented Oct 18, 2020

Trying to unpick these and forming a larger PR, #22, where I'll resolve the conflicts that have arisen

@rnorth rnorth closed this Oct 18, 2020
@rnorth rnorth mentioned this pull request Oct 18, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dmitry-timofeev @rnorth