Skip to content

Commit

Permalink
Merge pull request #653 from apiaryio/klokane/annotation-with-column-…
Browse files Browse the repository at this point in the history 
…line-info

Klokane/annotation with column line info
  • Loading branch information
@klokane
klokane authored Nov 15, 2018
2 parents ec00e31 + 3e078fa commit 1facd70
Show file tree
Hide file tree
Showing 62 changed files with 2,478 additions and 123 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Drafter Changelog

## master

* Add column/line info to anotations source maps

## 4.0.0-pre.1

### Breaking
Expand Down
9 changes: 7 additions & 2 deletions drafter.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,12 @@
"src/RefractElementFactory.cc",
"src/ConversionContext.cc",
"src/ConversionContext.h",
"src/ElementInfoUtils.h"
"src/ElementComparator.h"
"src/ElementInfoUtils.h",
"src/ElementComparator.h",


"src/SourceMapUtils.h",
"src/SourceMapUtils.cc",

"src/utils/Variant.h",
"src/utils/Utf8.h",
Expand Down Expand Up @@ -412,6 +416,7 @@
"test/test-ElementInfoUtils.cc",
"test/test-ElementComparator.cc",
"test/test-VisitorUtils.cc",
"test/test-sourceMapToLineColumn.cc",

],
'dependencies': [
Expand Down
60 changes: 60 additions & 0 deletions features/fixtures/refract.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1040,10 +1040,30 @@
"content": [
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 39
},
"column": {
"element": "number",
"content": 1
}
},
"content": 685
},
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 42
},
"column": {
"element": "number",
"content": 1
}
},
"content": 45
}
]
Expand Down Expand Up @@ -1084,10 +1104,30 @@
"content": [
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 55
},
"column": {
"element": "number",
"content": 1
}
},
"content": 992
},
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 58
},
"column": {
"element": "number",
"content": 1
}
},
"content": 45
}
]
Expand Down Expand Up @@ -1128,10 +1168,30 @@
"content": [
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 14
},
"column": {
"element": "number",
"content": 7
}
},
"content": 200
},
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 14
},
"column": {
"element": "number",
"content": 108
}
},
"content": 102
}
]
Expand Down
60 changes: 60 additions & 0 deletions features/fixtures/refract.sourcemap.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3212,10 +3212,30 @@
"content": [
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 39
},
"column": {
"element": "number",
"content": 1
}
},
"content": 685
},
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 42
},
"column": {
"element": "number",
"content": 1
}
},
"content": 45
}
]
Expand Down Expand Up @@ -3256,10 +3276,30 @@
"content": [
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 55
},
"column": {
"element": "number",
"content": 1
}
},
"content": 992
},
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 58
},
"column": {
"element": "number",
"content": 1
}
},
"content": 45
}
]
Expand Down Expand Up @@ -3300,10 +3340,30 @@
"content": [
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 14
},
"column": {
"element": "number",
"content": 7
}
},
"content": 200
},
{
"element": "number",
"attributes": {
"line": {
"element": "number",
"content": 14
},
"column": {
"element": "number",
"content": 108
}
},
"content": 102
}
]
Expand Down
42 changes: 42 additions & 0 deletions features/fixtures/refract.sourcemap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2095,9 +2095,23 @@ content:
content:
-
element: "number"
attributes:
line:
element: "number"
content: 39
column:
element: "number"
content: 1
content: 685
-
element: "number"
attributes:
line:
element: "number"
content: 42
column:
element: "number"
content: 1
content: 45
content: "the 'headers' section at this level is deprecated and will be removed in a future, use respective payload header section(s) instead"
-
Expand All @@ -2124,9 +2138,23 @@ content:
content:
-
element: "number"
attributes:
line:
element: "number"
content: 55
column:
element: "number"
content: 1
content: 992
-
element: "number"
attributes:
line:
element: "number"
content: 58
column:
element: "number"
content: 1
content: 45
content: "the 'headers' section at this level is deprecated and will be removed in a future, use respective payload header section(s) instead"
-
Expand All @@ -2153,8 +2181,22 @@ content:
content:
-
element: "number"
attributes:
line:
element: "number"
content: 14
column:
element: "number"
content: 7
content: 200
-
element: "number"
attributes:
line:
element: "number"
content: 14
column:
element: "number"
content: 108
content: 102
content: "invalid value format for 'number' type. please check mson specification for valid format"
42 changes: 42 additions & 0 deletions features/fixtures/refract.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,9 +701,23 @@ content:
content:
-
element: "number"
attributes:
line:
element: "number"
content: 39
column:
element: "number"
content: 1
content: 685
-
element: "number"
attributes:
line:
element: "number"
content: 42
column:
element: "number"
content: 1
content: 45
content: "the 'headers' section at this level is deprecated and will be removed in a future, use respective payload header section(s) instead"
-
Expand All @@ -730,9 +744,23 @@ content:
content:
-
element: "number"
attributes:
line:
element: "number"
content: 55
column:
element: "number"
content: 1
content: 992
-
element: "number"
attributes:
line:
element: "number"
content: 58
column:
element: "number"
content: 1
content: 45
content: "the 'headers' section at this level is deprecated and will be removed in a future, use respective payload header section(s) instead"
-
Expand All @@ -759,8 +787,22 @@ content:
content:
-
element: "number"
attributes:
line:
element: "number"
content: 14
column:
element: "number"
content: 7
content: 200
-
element: "number"
attributes:
line:
element: "number"
content: 14
column:
element: "number"
content: 108
content: 102
content: "invalid value format for 'number' type. please check mson specification for valid format"
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ set(DRAFTER_SOURCES
Render.cc
ConversionContext.cc
RefractElementFactory.cc
SourceMapUtils.cc
)

set(DRAFTER_COMPILE_FEATURES
Expand Down
7 changes: 6 additions & 1 deletion src/ConversionContext.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
namespace drafter
{

ConversionContext::ConversionContext(const char* source, const WrapperOptions& options)
: newLinesIndex(GetLinesEndIndex(source)), options(options)
{
}

void ConversionContext::warn(const snowcrash::Warning& warning)
{
for (auto& item : warnings) {
Expand All @@ -36,4 +41,4 @@ namespace drafter

warnings.push_back(warning);
}
}
}
Loading

0 comments on commit 1facd70

Please sign in to comment.