-
Notifications
You must be signed in to change notification settings - Fork 12
Fix annotations in nested blocks #38
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.
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
Closed
emortlock
wants to merge
8
commits into
SassDoc:master
from
emortlock:fix-annotations-in-nested-blocks
Closed
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f3bd2c6
Fix annotation parsing in nested comment blocks
davidknezic d08dc1d
Don't trim line twice in filterAndGroup function
davidknezic 7a608ab
Merge branch 'master' into fix-annotations-in-nested-blocks
emortlock ec7e7b2
Added tests for parsing annotations
emortlock ebcc8bf
Removed semicolons for consitent formatting
emortlock 8b7c39d
Removed arrow function to support older versions of node
emortlock 89207ac
Updated travis config to match SassDoc/sassdoc
emortlock 43e1e2d
Reverted removal of node versions
emortlock File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| language: node_js | ||
|
|
||
| node_js: | ||
| - '0.10' | ||
| - '0.12' | ||
| - '4.2' | ||
| - 'stable' | ||
| - 6 | ||
| - 8 | ||
| - lts/* | ||
| - stable | ||
|
|
||
| sudo: false | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| /// Description | ||
| /// @test Test | ||
| .foo { | ||
| font-weight: bold; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| $foo: true; | ||
|
|
||
| @if ($foo) { | ||
| /// Description | ||
| /// @test Test | ||
| .foo { | ||
| font-weight: bold; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just add
6,8,lts/*, leave the rest untouched, we will remove old node support in the next major, but until then this would be a breaking change.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reapplied those versions, but seems to be an issue with the 4.2 pipleline job - https://travis-ci.org/SassDoc/scss-comment-parser/jobs/528927921
Can't see it being related to the changes in the PR, can't even get yarn to run using that version locally.
Worth trying 4.8 that's mentioned in the warning? Same major version so shouldn't be considered breaking?