Improved grammar and syntax #1093

p-kuen · 2019-02-14T07:56:35Z

Added prettier as a pre-commit-hook as described in PR Simplified grammar compiling process #1080 and Make prettier a pre-commit hook #1089
Changed Contributing.md in .github folder (which is referenced by README.md)
Fixed custom block generation (as issued in Custom blocks break the highlighting #1088)

prettifies js, ts and yaml files for now Resolves #1089

Belongs to 05307ee

Could be a fix for the first comment in #1088

- Everyone can use the word 'template' in custom blocks now - Fixes #1088

- as mentioned in #1095

to make this possible I had to make two functions async (for dynamic vscode import) alternative: put the generateGrammarCommandHandler into a seperate file

syntaxes/vue.yaml

client/grammar.ts

syntaxes/vue.tmLanguage.json

octref · 2019-02-15T17:26:14Z

This case still seems broken:

<template lang="pug">
section
  router-link.header.item(to=`/`)
    img(
      src=`/images/navbar-icon.svg`
      :alt=`title`
      )

  .right.menu
    navbar-menu
</template>

p-kuen · 2019-02-15T17:44:40Z

Yeah, that's right. I tried many things but got no good solution - so this case would be a bit trickier.
I would prefer to use a space after the title keyword or put it into multiple lines if using the ` literal.

octref · 2019-02-15T18:11:56Z

If supporting backtick would bring in too much complexity I suggest dropping it, documenting it in the https://vuejs.github.io/vetur/highlighting.html page and moving on.

as discussed in PR #1093 removed async keyword again also changed some * as imports to destructured imports

As discussed in PR #1093

Closes #1095

Closes #1096

octref

Just small nitpicks. Please resolve the path and leave using \/ for later. This looks great. Thanks a lot for adding the test infrastructure!

test/grammar.test.ts

Co-Authored-By: Patcher56 <patrick.kuen11@gmail.com>

- using path.resolve for paths now - showing better error messages if assertion fails

octref · 2019-02-20T18:58:14Z

👍 Thanks a lot for the quick response!

p-kuen added 6 commits February 14, 2019 07:41

Added prettier as a pre-commit-hook

5451851

prettifies js, ts and yaml files for now Resolves #1089

Also changed CONTRIBUTING.md in .github folder

1c789e4

Belongs to 05307ee

Fixed custom block generation works without restarting vscode at first.

ea3cce5

Could be a fix for the first comment in #1088

We are now only matching templates immediately closing (e.g. <template>)

f2326d4

- Everyone can use the word 'template' in custom blocks now - Fixes #1088

Simplified vue-directives

58f72ee

- as mentioned in #1095

Merge branch 'master' of github.com:Patcher56/vetur

c071f8f

p-kuen mentioned this pull request Feb 15, 2019

Element attribute break highlighting when using "`" on single line reference values. #1095

Closed

3 tasks

Conv build_grammar to typescript, added generation of vue-generated.json

39ab7cd

to make this possible I had to make two functions async (for dynamic vscode import) alternative: put the generateGrammarCommandHandler into a seperate file

octref requested changes Feb 15, 2019

View reviewed changes

syntaxes/vue.yaml Outdated Show resolved Hide resolved

client/grammar.ts Outdated Show resolved Hide resolved

client/grammar.ts Show resolved Hide resolved

syntaxes/vue.tmLanguage.json Outdated Show resolved Hide resolved

p-kuen added 4 commits February 16, 2019 07:10

Put generateGrammarCommandHandler into separate file

70f908d

as discussed in PR #1093 removed async keyword again also changed some * as imports to destructured imports

Fixed <template functional> not highlighting right.

61b0719

As discussed in PR #1093

Added some small syntax highlighting test files.

58cae18

Dropped support for the backtick ` literal

cae5e15

Closes #1095

p-kuen mentioned this pull request Feb 16, 2019

Create a test environment for syntax highlighting. #1096

Closed

Added automated grammar tests

cef140a

Closes #1096

octref requested changes Feb 19, 2019

View reviewed changes

test/grammar.test.ts Outdated Show resolved Hide resolved

p-kuen and others added 4 commits February 20, 2019 09:15

Removed \/ because of consistency

b9c8112

Using path.resolve for paths in grammar tests

92116e6

Co-Authored-By: Patcher56 <patrick.kuen11@gmail.com>

Improved grammar tests

aba00bf

- using path.resolve for paths now - showing better error messages if assertion fails

Merge branch 'master' of github.com:Patcher56/vetur

9a482bc

octref approved these changes Feb 20, 2019

View reviewed changes

octref merged commit b298d75 into vuejs:master Feb 20, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improved grammar and syntax #1093

Improved grammar and syntax #1093

p-kuen commented Feb 14, 2019

octref commented Feb 15, 2019

p-kuen commented Feb 15, 2019

octref commented Feb 15, 2019 •

edited

Loading

octref left a comment

octref commented Feb 20, 2019

Improved grammar and syntax #1093

Improved grammar and syntax #1093

Conversation

p-kuen commented Feb 14, 2019

octref commented Feb 15, 2019

p-kuen commented Feb 15, 2019

octref commented Feb 15, 2019 • edited Loading

octref left a comment

Choose a reason for hiding this comment

octref commented Feb 20, 2019

octref commented Feb 15, 2019 •

edited

Loading