D17460: fixups for `extern` and `pragma`

[Dominik Haumann]

This revision was automatically updated to reflect the committed changes.
Closed by commit R216:dc79692de359: fixups for `extern` and `pragma` (authored 
by dhaumann).

CHANGED PRIOR TO COMMIT
  https://phabricator.kde.org/D17460?vs=48634&id=48635#toc

REPOSITORY
  R216 Syntax Highlighting

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D17460?vs=48634&id=48635

REVISION DETAIL
  https://phabricator.kde.org/D17460

AFFECTED FILES
  autotests/folding/highlight.d.fold
  autotests/html/highlight.d.html
  autotests/input/highlight.d
  autotests/reference/highlight.d.ref
  data/syntax/d.xml

To: aG0aep6G, dhaumann
Cc: dhaumann, kwrite-devel, kde-frameworks-devel, hase, michaelh, ngraham, 
bruns, demsking, cullmann, sars

D17460: fixups for `extern` and `pragma`

[aG0aep6G aG0aep6G]

aG0aep6G added a comment.


  In D17460#386002 , @dhaumann wrote:
  
  > Can you provide an updated patch to fix this? Or at least tell me what 
lineEndContext should be used here?
  
  
  Fixed, I hope.

REPOSITORY
  R216 Syntax Highlighting

BRANCH
  extern-and-pragma

REVISION DETAIL
  https://phabricator.kde.org/D17460

To: aG0aep6G, dhaumann
Cc: dhaumann, kwrite-devel, kde-frameworks-devel, hase, michaelh, ngraham, 
bruns, demsking, cullmann, sars

D17460: fixups for `extern` and `pragma`

[aG0aep6G aG0aep6G]

aG0aep6G updated this revision to Diff 48634.
aG0aep6G added a comment.


  - add missing lineEndContext attribute

REPOSITORY
  R216 Syntax Highlighting

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D17460?vs=47369&id=48634

BRANCH
  extern-and-pragma

REVISION DETAIL
  https://phabricator.kde.org/D17460

AFFECTED FILES
  autotests/html/highlight.d.html
  autotests/input/highlight.d
  autotests/reference/highlight.d.ref
  data/syntax/d.xml

To: aG0aep6G, dhaumann
Cc: dhaumann, kwrite-devel, kde-frameworks-devel, hase, michaelh, ngraham, 
bruns, demsking, cullmann, sars

D17460: fixups for `extern` and `pragma`

[Dominik Haumann]

dhaumann added a comment.


  @aG0aep6G I just tried to commit this, but it does not work due to the 
following issue:
  
XSDError in data/syntax/d.xml, at line 613, column 60: Element context is 
missing required attribute lineEndContext.
  
  Can you provide an updated patch to fix this? Or at least tell me what 
lineEndContext should be used here?

REPOSITORY
  R216 Syntax Highlighting

BRANCH
  extern-and-pragma

REVISION DETAIL
  https://phabricator.kde.org/D17460

To: aG0aep6G, dhaumann
Cc: dhaumann, kwrite-devel, kde-frameworks-devel, hase, michaelh, ngraham, 
bruns, demsking, cullmann, sars

D17460: fixups for `extern` and `pragma`

[Dominik Haumann]

dhaumann accepted this revision.
dhaumann added a comment.
This revision is now accepted and ready to land.


  Thanks, good patch again.
  
  Note to self: Before we commit, we need to increase the version number in the 
language xml element.

REPOSITORY
  R216 Syntax Highlighting

BRANCH
  extern-and-pragma

REVISION DETAIL
  https://phabricator.kde.org/D17460

To: aG0aep6G, dhaumann
Cc: dhaumann, kwrite-devel, kde-frameworks-devel, hase, michaelh, ngraham, 
bruns, demsking, cullmann, sars

D17460: fixups for `extern` and `pragma`

[aG0aep6G aG0aep6G]

aG0aep6G added a comment.


  In D17460#374942 , @dhaumann wrote:
  
  > Could you also extend the unit test in autotest/input/highlight.d?
  
  
  Done. I also noticed that my last patch broke `version = X;` so I fixed that, 
too.

REPOSITORY
  R216 Syntax Highlighting

REVISION DETAIL
  https://phabricator.kde.org/D17460

To: aG0aep6G
Cc: dhaumann, kwrite-devel, kde-frameworks-devel, hase, michaelh, ngraham, 
bruns, demsking, cullmann, sars

D17460: fixups for `extern` and `pragma`

[aG0aep6G aG0aep6G]

aG0aep6G updated this revision to Diff 47369.
aG0aep6G added a comment.


  - update test files
  - fix `version = foo;`
  - add some more test lines

REPOSITORY
  R216 Syntax Highlighting

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D17460?vs=47214&id=47369

BRANCH
  extern-and-pragma

REVISION DETAIL
  https://phabricator.kde.org/D17460

AFFECTED FILES
  autotests/html/highlight.d.html
  autotests/input/highlight.d
  autotests/reference/highlight.d.ref
  data/syntax/d.xml

To: aG0aep6G
Cc: dhaumann, kwrite-devel, kde-frameworks-devel, hase, michaelh, ngraham, 
bruns, demsking, cullmann, sars

D17460: fixups for `extern` and `pragma`

[Dominik Haumann]

dhaumann added a comment.


  Could you also extend the unit test in autotest/input/highlight.d?
  
  See e.g.: 
https://github.com/KDE/syntax-highlighting/commit/66367f8e636623a2dbb8ee6add9c7f36683605a2

REPOSITORY
  R216 Syntax Highlighting

REVISION DETAIL
  https://phabricator.kde.org/D17460

To: aG0aep6G
Cc: dhaumann, kwrite-devel, kde-frameworks-devel, hase, michaelh, ngraham, 
bruns, demsking, cullmann, sars

D17460: fixups for `extern` and `pragma`

[aG0aep6G aG0aep6G]

aG0aep6G created this revision.
Herald added projects: Kate, Frameworks.
Herald added subscribers: kde-frameworks-devel, kwrite-devel.
aG0aep6G requested review of this revision.

REVISION SUMMARY
  add "Objective-C" linkage type
  
  fix `extern(C++)` and add support for `extern(C++, ...)`
  
  fix `pragma(foo, ...)`
  
  add more well-known pragma types

REPOSITORY
  R216 Syntax Highlighting

BRANCH
  extern-and-pragma

REVISION DETAIL
  https://phabricator.kde.org/D17460

AFFECTED FILES
  data/syntax/d.xml

To: aG0aep6G
Cc: kwrite-devel, kde-frameworks-devel, hase, michaelh, ngraham, bruns, 
demsking, cullmann, sars, dhaumann