Skip to content

Fix comments in regions #12

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

Open
aalvarado wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix comments in regions #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eb1a05
Update prisma.vim
aalvarado Feb 22, 2023
d79385e
Have comments inside declarations
aalvarado Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions syntax/prisma.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ endif
syn case match

" Comment
syn match prismaComment "\v//.*$"
syn match prismaComment "\v\s*//.*$"
" Directive
syn match prismaDirective /\<@@\=\h\w*/ nextgroup=prismaFunctionParans
" Ugly hack right now, probably this is not needed after refactoring
Expand All @@ -24,7 +24,7 @@ syn match prismaType /\<\h\w*\>/ contained containedin=prismaModelDeclaration ne
syn region prismaFieldRegion start=/\v^\s*/ms=e+1 end=/\v\s/me=s-1 contains=prismaField,prismaComment contained transparent containedin=prismaModelDeclaration skipwhite
syn match prismaMultiFieldDirective /^\s*@/ contained containedin=prismaModelDeclaration nextgroup=prismaPartialDirective

syn region prismaNonModelDeclaration matchgroup=prismaModel start=/\v((datasource)=(generator)=(enum)=)+\s+\h\w*\s*\{/ end=/}/ contains=prismaString,prismaList,prismaValueDeclarationRegion,prismaOperator transparent
syn region prismaNonModelDeclaration matchgroup=prismaModel start=/\v((datasource)=(generator)=(enum)=)+\s+\h\w*\s*\{/ end=/}/ contains=prismaString,prismaList,prismaValueDeclarationRegion,prismaOperator,prismaComment transparent
syn match prismaValue /\<\h\w*\>/ contained containedin=prismaValueDeclarationRegion,prismaTypeAliasDeclaration nextgroup=prismaOperator skipwhite
syn region prismaValueDeclarationRegion start=/\v^\s*/ms=e+1 end=/\v\s*/me=s-1 contains=prismaValueDeclaration contained transparent containedin=prismaNonModelDeclaration skipwhite

Expand All @@ -33,7 +33,6 @@ syn match prismaOperator "\[\]" display
syn match prismaOperator /\v\=/ display
syn region prismaList matchgroup=prismaList start="\[" end="]" contains=ALLBUT,prismaDirective,prismaModelDeclaration,prismaNonModelDeclaration


hi def link prismaList Delimiter
hi def link prismaParans Delimiter
hi def link prismaDirective PreProc
Expand Down