Skip to content

Commit

Permalink
Merge fbdc3ac into 27a5775
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZyX-I
ZyX-I committed Dec 3, 2017
2 parents 27a5775 + fbdc3ac commit 17dd63b
Show file tree
Hide file tree
Showing 49 changed files with 17,344 additions and 649 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Expand Up @@ -68,9 +68,9 @@ set(NVIM_VERSION_PATCH 3)
set(NVIM_VERSION_PRERELEASE "-dev") # for package maintainers

# API level
set(NVIM_API_LEVEL 3) # Bump this after any API change.
set(NVIM_API_LEVEL 4) # Bump this after any API change.
set(NVIM_API_LEVEL_COMPAT 0) # Adjust this after a _breaking_ API change.
set(NVIM_API_PRERELEASE false)
set(NVIM_API_PRERELEASE true)

file(TO_CMAKE_PATH ${CMAKE_CURRENT_LIST_DIR}/.git FORCED_GIT_DIR)
include(GetGitRevisionDescription)
Expand Down
121 changes: 120 additions & 1 deletion runtime/doc/eval.txt
View file
Expand Up @@ -10563,7 +10563,7 @@ option will still be marked as it was set in the sandbox.
In a few situations it is not allowed to change the text in the buffer, jump
to another window and some other things that might confuse or break what Vim
is currently doing. This mostly applies to things that happen when Vim is
actually doing something else. For example, evaluating the 'balloonexpr' may
actually doing something else. For example, evaluating the 'balloonexpr' may
happen any moment the mouse cursor is resting at some position.

This is not allowed when the textlock is active:
Expand All @@ -10573,5 +10573,124 @@ This is not allowed when the textlock is active:
- closing a window or quitting Vim
- etc.

==============================================================================
13. Command-line expressions coloring *expr-coloring*

Expressions entered by user in |i_CTRL-R_=|, |c_CTRL-\_e|, |quote=| are
colored by built-in expressions parser. It uses highlight groups described in
the table below, which may be overriden by user colorschemes, all linked to
some other highlighting group.
*hl-NvimInvalid*
In addition to highlighting groups prefixed with Nvim described below there
are highlighting groups prefixed with NvimInvalid which have just the same
meaning, but used to indicate that the relevant token contains an error or
that error had occurred just before it. They have mostly the same hierarchy,
except that by default in place of any non-Nvim-prefixed group NvimInvalid
linking to `Error` is used and some other intermediate groups are present.

Group Default link Colored expression ~
*hl-NvimInternalError* None, red/red Parser bug

*hl-NvimAssignment* Operator Generic assignment
*hl-NvimPlainAssignment* NvimAssignment `=` in |:let|
*hl-NvimAugmentedAssignment* NvimAssignment Generic, `+=`/`-=`/`.=`
*hl-NvimAssignmentWithAddition* NvimAugmentedAssignment `+=` in |:let+=|
*hl-NvimAssignmentWithSubtraction* NvimAugmentedAssignment `-=` in |:let-=|
*hl-NvimAssignmentWithConcatenation* NvimAugmentedAssignment `.=` in |:let.=|

*hl-NvimOperator* Operator Generic operator

*hl-NvimUnaryOperator* NvimOperator Generic unary op
*hl-NvimUnaryPlus* NvimUnaryOperator |expr-unary-+|
*hl-NvimUnaryMinus* NvimUnaryOperator |expr-unary--|
*hl-NvimNot* NvimUnaryOperator |expr-!|

*hl-NvimBinaryOperator* NvimOperator Generic binary op
*hl-NvimComparison* NvimBinaryOperator Any |expr4| operator
*hl-NvimComparisonModifier* NvimComparison `#`/`?` near |expr4| op
*hl-NvimBinaryPlus* NvimBinaryOperator |expr-+|
*hl-NvimBinaryMinus* NvimBinaryOperator |expr--|
*hl-NvimConcat* NvimBinaryOperator |expr-.|
*hl-NvimConcatOrSubscript* NvimConcat |expr-.| or |expr-entry|
*hl-NvimOr* NvimBinaryOperator |expr-barbar|
*hl-NvimAnd* NvimBinaryOperator |expr-&&|
*hl-NvimMultiplication* NvimBinaryOperator |expr-star|
*hl-NvimDivision* NvimBinaryOperator |expr-/|
*hl-NvimMod* NvimBinaryOperator |expr-%|

*hl-NvimTernary* NvimOperator `?` in |expr1|
*hl-NvimTernaryColon* NvimTernary `:` in |expr1|

*hl-NvimParenthesis* Delimiter Generic bracket
*hl-NvimLambda* NvimParenthesis `{`/`}` in |lambda|
*hl-NvimNestingParenthesis* NvimParenthesis `(`/`)` in |expr-nesting|
*hl-NvimCallingParenthesis* NvimParenthesis `(`/`)` in |expr-function|

*hl-NvimSubscript* NvimParenthesis Generic subscript
*hl-NvimSubscriptBracket* NvimSubscript `[`/`]` in |expr-[]|
*hl-NvimSubscriptColon* NvimSubscript `:` in |expr-[:]|
*hl-NvimCurly* NvimSubscript `{`/`}` in
|curly-braces-names|

*hl-NvimContainer* NvimParenthesis Generic container
*hl-NvimDict* NvimContainer `{`/`}` in |dict| literal
*hl-NvimList* NvimContainer `[`/`]` in |list| literal

*hl-NvimIdentifier* Identifier Generic identifier
*hl-NvimIdentifierScope* NvimIdentifier Namespace: letter
before `:` in
|internal-variables|
*hl-NvimIdentifierScopeDelimiter* NvimIdentifier `:` after namespace
letter
*hl-NvimIdentifierName* NvimIdentifier Rest of the ident
*hl-NvimIdentifierKey* NvimIdentifier Identifier after
|expr-entry|

*hl-NvimColon* Delimiter `:` in |dict| literal
*hl-NvimComma* Delimiter `,` in |dict|/|list|
literal or
|expr-function|
*hl-NvimArrow* Delimiter `->` in |lambda|

*hl-NvimRegister* SpecialChar |expr-register|
*hl-NvimNumber* Number Non-prefix digits
in integer
|expr-number|
*hl-NvimNumberPrefix* Type `0` for |octal-number|
`0x` for |hex-number|
`0b` for |binary-number|
*hl-NvimFloat* NvimNumber Floating-point
number

*hl-NvimOptionSigil* Type `&` in |expr-option|
*hl-NvimOptionScope* NvimIdentifierScope Option scope if any
*hl-NvimOptionScopeDelimiter* NvimIdentifierScopeDelimiter
`:` after option scope
*hl-NvimOptionName* NvimIdentifier Option name

*hl-NvimEnvironmentSigil* NvimOptionSigil `$` in |expr-env|
*hl-NvimEnvironmentName* NvimIdentifier Env variable name

*hl-NvimString* String Generic string
*hl-NvimStringBody* NvimString Generic string
literal body
*hl-NvimStringQuote* NvimString Generic string quote
*hl-NvimStringSpecial* SpecialChar Generic string
non-literal body

*hl-NvimSingleQuote* NvimStringQuote `'` in |expr-'|
*hl-NvimSingleQuotedBody* NvimStringBody Literal part of
|expr-'| string body
*hl-NvimSingleQuotedQuote* NvimStringSpecial `''` inside |expr-'|
string body

*hl-NvimDoubleQuote* NvimStringQuote `"` in |expr-quote|
*hl-NvimDoubleQuotedBody* NvimStringBody Literal part of
|expr-quote| body
*hl-NvimDoubleQuotedEscape* NvimStringSpecial Valid |expr-quote|
escape sequence
*hl-NvimDoubleQuotedUnknownEscape* NvimInvalidValue Unrecognized
|expr-quote| escape
sequence

vim:tw=78:ts=8:noet:ft=help:norl:
13 changes: 7 additions & 6 deletions runtime/doc/vim_diff.txt
View file
Expand Up @@ -167,12 +167,13 @@ Highlight groups:
|hl-Whitespace| highlights 'listchars' whitespace

UI:
*E5408* *E5409* *g:Nvim_color_expr* *g:Nvim_color_cmdline*
Command-line coloring is supported. Only |input()| and |inputdialog()| may
be colored. For testing purposes expressions (e.g. |i_CTRL-R_=|) and regular
command-line (|:|) are colored by callbacks defined in `g:Nvim_color_expr`
and `g:Nvim_color_cmdline` respectively (these callbacks are for testing
only, and will be removed in a future version).
*E5408* *E5409* *g:Nvim_color_cmdline*
Command-line coloring is supported. Only |input()| and |inputdialog()| may
be colored by user. For testing purposes regular command-line (|:|) is
colored by callback defined in `g:Nvim_color_cmdline` (this callback is for
testing only, and will be removed in a future version). Additionally
expression command-line is colored using built-in expressions parser (it is
not yet used for actually parsing expressions though), see |expr-coloring|.

==============================================================================
4. Changed features *nvim-features-changed*
Expand Down
2 changes: 2 additions & 0 deletions src/nvim/CMakeLists.txt
View file
Expand Up @@ -86,6 +86,8 @@ foreach(subdir
event
eval
lua
viml
viml/parser
)
if(${subdir} MATCHES "tui" AND NOT FEAT_TUI)
continue()
Expand Down

0 comments on commit 17dd63b

Please sign in to comment.