mirror of
				https://github.com/sharkdp/bat.git
				synced 2025-10-30 22:54:07 +00:00 
			
		
		
		
	Merge branch 'master' into syslog
This commit is contained in:
		
							
								
								
									
										1
									
								
								assets/syntaxes/02_Extra/CSV
									
									
									
									
										vendored
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										1
									
								
								assets/syntaxes/02_Extra/CSV
									
									
									
									
										vendored
									
									
								
							 Submodule assets/syntaxes/02_Extra/CSV deleted from 4786d037a7
									
								
							
							
								
								
									
										110
									
								
								assets/syntaxes/02_Extra/CSV.sublime-syntax
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										110
									
								
								assets/syntaxes/02_Extra/CSV.sublime-syntax
									
									
									
									
										vendored
									
									
								
							| @@ -1,46 +1,78 @@ | ||||
| %YAML 1.2 | ||||
| --- | ||||
| # http://www.sublimetext.com/docs/3/syntax.html | ||||
| name: Advanced CSV | ||||
| # See http://www.sublimetext.com/docs/3/syntax.html | ||||
| name: Comma Separated Values | ||||
| file_extensions: | ||||
|   - csv | ||||
|   - tsv | ||||
| scope: text.advanced_csv | ||||
| scope: text.csv | ||||
| variables: | ||||
|   field_separator: (?:[,;\t]) | ||||
|   record_separator: (?:$\n?) | ||||
| contexts: | ||||
|   prototype: | ||||
|     - match: (?={{record_separator}}) | ||||
|       pop: true | ||||
|   fields: | ||||
|     - match: '' | ||||
|       push: | ||||
|         - field_or_record_separator | ||||
|         - field4 | ||||
|         - field_or_record_separator | ||||
|         - field3 | ||||
|         - field_or_record_separator | ||||
|         - field2 | ||||
|         - field_or_record_separator | ||||
|         - field1 | ||||
|   main: | ||||
|     - match: (\") | ||||
|       captures: | ||||
|         1: string.quoted.double.advanced_csv | ||||
|       push: | ||||
|         - meta_scope: meta.quoted.advanced_csv | ||||
|         - match: (\") | ||||
|           captures: | ||||
|             1: string.quoted.double.advanced_csv | ||||
|           pop: true | ||||
|         - include: main | ||||
|     - match: '(\[([+-]?\d*)(\:)?([+-]?\d*)(\,)?([+-]?\d*)(\:)?([+-]?\d*)\])?\s*([<>v^])?\s*(=)' | ||||
|       captures: | ||||
|         1: keyword.operator.advanced_csv | ||||
|         2: constant.numeric.formula.advanced_csv | ||||
|         4: constant.numeric.formula.advanced_csv | ||||
|         6: constant.numeric.formula.advanced_csv | ||||
|         8: constant.numeric.formula.advanced_csv | ||||
|         9: keyword.operator.advanced_csv | ||||
|         10: keyword.operator.advanced_csv | ||||
|       push: | ||||
|         - meta_scope: meta.range.advanced_csv | ||||
|         - match: (?=(\")|$) | ||||
|           pop: true | ||||
|         - include: scope:source.python | ||||
|     - match: '(?<=^|,|\s|\")([0-9.eE+-]+)(?=$|,|\s|\")' | ||||
|       scope: meta.number.advanced_csv | ||||
|       captures: | ||||
|         1: constant.numeric.advanced_csv | ||||
|     - match: '(?<=^|,|\s|\")([^, \t\"]+)(?=$|,|\s|\")' | ||||
|       scope: meta.nonnumber.advanced_csv | ||||
|       captures: | ||||
|         1: storage.type.advanced_csv | ||||
|     - match: (\,) | ||||
|       scope: meta.delimiter.advanced_csv | ||||
|       captures: | ||||
|         1: keyword.operator.advanced_csv | ||||
|     - meta_include_prototype: false | ||||
|     - match: '^' | ||||
|       set: fields | ||||
|  | ||||
|   field_or_record_separator: | ||||
|     - meta_include_prototype: false | ||||
|     - match: '{{record_separator}}' | ||||
|       scope: punctuation.terminator.record.csv | ||||
|       pop: true | ||||
|     - match: '{{field_separator}}' | ||||
|       scope: punctuation.separator.sequence.csv | ||||
|       pop: true | ||||
|  | ||||
|   field_contents: | ||||
|     - match: '"' | ||||
|       scope: punctuation.definition.string.begin.csv | ||||
|       push: double_quoted_string | ||||
|  | ||||
|     - match: (?={{field_separator}}|{{record_separator}}) | ||||
|       pop: true | ||||
|  | ||||
|   double_quoted_string: | ||||
|     - meta_include_prototype: false | ||||
|     - meta_scope: string.quoted.double.csv | ||||
|     - match: '""' | ||||
|       scope: constant.character.escape.csv | ||||
|     - match: '"' | ||||
|       scope: punctuation.definition.string.end.csv | ||||
|       pop: true | ||||
|  | ||||
|   field1: | ||||
|     - match: '' | ||||
|       set: | ||||
|         - meta_content_scope: meta.field-1.csv support.type | ||||
|         - include: field_contents | ||||
|   field2: | ||||
|     - match: '' | ||||
|       set: | ||||
|         - meta_content_scope: meta.field-2.csv support.function | ||||
|         - include: field_contents | ||||
|   field3: | ||||
|     - match: '' | ||||
|       set: | ||||
|         - meta_content_scope: meta.field-3.csv constant.numeric | ||||
|         - include: field_contents | ||||
|   field4: | ||||
|     - match: '' | ||||
|       set: | ||||
|         - meta_content_scope: meta.field-4.csv keyword.operator | ||||
|         - include: field_contents | ||||
|  | ||||
|   | ||||
							
								
								
									
										2
									
								
								assets/syntaxes/02_Extra/Julia
									
									
									
									
										vendored
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								assets/syntaxes/02_Extra/Julia
									
									
									
									
										vendored
									
									
								
							 Submodule assets/syntaxes/02_Extra/Julia updated: 45a1b6fe6c...cc13e7d4ef
									
								
							
							
								
								
									
										2
									
								
								assets/syntaxes/02_Extra/SCSS_Sass
									
									
									
									
										vendored
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								assets/syntaxes/02_Extra/SCSS_Sass
									
									
									
									
										vendored
									
									
								
							 Submodule assets/syntaxes/02_Extra/SCSS_Sass updated: 4868322030...63819a1ab6
									
								
							
							
								
								
									
										60
									
								
								assets/syntaxes/02_Extra/syntax_test_csv.csv
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								assets/syntaxes/02_Extra/syntax_test_csv.csv
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,60 @@ | ||||
| # SYNTAX TEST "CSV.sublime-syntax" | ||||
| Forename,Surname,House No.,Street,City,Postcode | ||||
| #^^^^^^^ meta.field-1 | ||||
| #       ^ punctuation.separator.sequence | ||||
| #        ^^^^^^^ meta.field-2 | ||||
| #               ^ punctuation.separator.sequence | ||||
| #                ^^^^^^^^^ meta.field-3 | ||||
| #                         ^ punctuation.separator.sequence | ||||
| #                          ^^^^^^ meta.field-4 | ||||
| #                                ^ punctuation.separator.sequence | ||||
| #                                 ^^^^ meta.field-1 | ||||
| #                                     ^ punctuation.separator.sequence | ||||
| #                                      ^^^^^^^^ meta.field-2 | ||||
| John,Doe,87,Logon Road,Citiville,TU43 6GH | ||||
| #^^^ meta.field-1 | ||||
| #   ^ punctuation.separator.sequence | ||||
| #    ^^^ meta.field-2 | ||||
| #       ^ punctuation.separator.sequence | ||||
| #        ^^ meta.field-3 | ||||
| #          ^ punctuation.separator.sequence | ||||
| #           ^^^^^^^^^^ meta.field-4 | ||||
| #                     ^ punctuation.separator.sequence | ||||
| #                      ^^^^^^^^^ meta.field-1 | ||||
| #                               ^ punctuation.separator.sequence | ||||
| #                                ^^^^^^^^ meta.field-2 | ||||
| Jane,Doe,22,"""Fun"" Street","The City, County",FA90 1XA | ||||
| #^^^ meta.field-1 | ||||
| #   ^ punctuation.separator.sequence | ||||
| #    ^^^ meta.field-2 | ||||
| #       ^ punctuation.separator.sequence | ||||
| #        ^^ meta.field-3 | ||||
| #          ^ punctuation.separator.sequence | ||||
| #           ^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double | ||||
| #            ^^ constant.character.escape | ||||
| #                 ^^ constant.character.escape | ||||
| #                           ^ punctuation.separator.sequence | ||||
| #                            ^ meta.field-1 string.quoted.double punctuation.definition.string.begin | ||||
| #                             ^^^^^^^^^^^^^^^^^ meta.field-1 string.quoted.double | ||||
| #                                             ^ meta.field-1 string.quoted.double punctuation.definition.string.end | ||||
| #                                              ^ punctuation.separator.sequence | ||||
| #                                               ^^^^^^^^ meta.field-2 | ||||
| Fred,Bloggs,"19","Street | ||||
| #^^^ meta.field-1 | ||||
| #   ^ punctuation.separator.sequence | ||||
| #    ^^^^^^ meta.field-2 | ||||
| #          ^ punctuation.separator.sequence | ||||
| #            ^^^ meta.field-3 string.quoted.double | ||||
| #               ^ punctuation.separator.sequence | ||||
| #                ^ meta.field-4 punctuation.definition.string.begin | ||||
| #                ^^^^^^^^ meta.field-4 string.quoted.double | ||||
| Spanning Multiple "" | ||||
| #^^^^^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double | ||||
| #                 ^^ constant.character.escape | ||||
| Lines",Citee,P0stc0d3 | ||||
| #^^^^^ meta.field-4 string.quoted.double | ||||
| #    ^ meta.field-4 punctuation.definition.string.end | ||||
| #     ^ punctuation.separator.sequence | ||||
| #      ^^^^^ meta.field-1 | ||||
| #           ^ punctuation.separator.sequence | ||||
| #            ^^^^^^^^ meta.field-2 | ||||
| Can't render this file because it contains an unexpected character in line 1 and column 15. | 
							
								
								
									
										60
									
								
								assets/syntaxes/02_Extra/syntax_test_tsv.tsv
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								assets/syntaxes/02_Extra/syntax_test_tsv.tsv
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,60 @@ | ||||
| # SYNTAX TEST "CSV.sublime-syntax" | ||||
| Forename	Surname	House No.	Street	City	Postcode | ||||
| #^^^^^^^ meta.field-1 | ||||
| #       ^ punctuation.separator.sequence | ||||
| #        ^^^^^^^ meta.field-2 | ||||
| #               ^ punctuation.separator.sequence | ||||
| #                ^^^^^^^^^ meta.field-3 | ||||
| #                         ^ punctuation.separator.sequence | ||||
| #                          ^^^^^^ meta.field-4 | ||||
| #                                ^ punctuation.separator.sequence | ||||
| #                                 ^^^^ meta.field-1 | ||||
| #                                     ^ punctuation.separator.sequence | ||||
| #                                      ^^^^^^^^ meta.field-2 | ||||
| John	Doe	87	Logon Road	Citiville	TU43 6GH | ||||
| #^^^ meta.field-1 | ||||
| #   ^ punctuation.separator.sequence | ||||
| #    ^^^ meta.field-2 | ||||
| #       ^ punctuation.separator.sequence | ||||
| #        ^^ meta.field-3 | ||||
| #          ^ punctuation.separator.sequence | ||||
| #           ^^^^^^^^^^ meta.field-4 | ||||
| #                     ^ punctuation.separator.sequence | ||||
| #                      ^^^^^^^^^ meta.field-1 | ||||
| #                               ^ punctuation.separator.sequence | ||||
| #                                ^^^^^^^^ meta.field-2 | ||||
| Jane	Doe	22	"""Fun"" Street"	"The City	 County"	FA90 1XA | ||||
| #^^^ meta.field-1 | ||||
| #   ^ punctuation.separator.sequence | ||||
| #    ^^^ meta.field-2 | ||||
| #       ^ punctuation.separator.sequence | ||||
| #        ^^ meta.field-3 | ||||
| #          ^ punctuation.separator.sequence | ||||
| #           ^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double | ||||
| #            ^^ constant.character.escape | ||||
| #                 ^^ constant.character.escape | ||||
| #                           ^ punctuation.separator.sequence | ||||
| #                            ^ meta.field-1 string.quoted.double punctuation.definition.string.begin | ||||
| #                             ^^^^^^^^^^^^^^^^^ meta.field-1 string.quoted.double | ||||
| #                                             ^ meta.field-1 string.quoted.double punctuation.definition.string.end | ||||
| #                                              ^ punctuation.separator.sequence | ||||
| #                                               ^^^^^^^^ meta.field-2 | ||||
| Fred	Bloggs	"19"	"Street | ||||
| #^^^ meta.field-1 | ||||
| #   ^ punctuation.separator.sequence | ||||
| #    ^^^^^^ meta.field-2 | ||||
| #          ^ punctuation.separator.sequence | ||||
| #            ^^^ meta.field-3 string.quoted.double | ||||
| #               ^ punctuation.separator.sequence | ||||
| #                ^ meta.field-4 punctuation.definition.string.begin | ||||
| #                ^^^^^^^^ meta.field-4 string.quoted.double | ||||
| Spanning Multiple "" | ||||
| #^^^^^^^^^^^^^^^^^^^^ meta.field-4 string.quoted.double | ||||
| #                 ^^ constant.character.escape | ||||
| Lines"	Citee	P0stc0d3 | ||||
| #^^^^^ meta.field-4 string.quoted.double | ||||
| #    ^ meta.field-4 punctuation.definition.string.end | ||||
| #     ^ punctuation.separator.sequence | ||||
| #      ^^^^^ meta.field-1 | ||||
| #           ^ punctuation.separator.sequence | ||||
| #            ^^^^^^^^ meta.field-2 | ||||
| Can't render this file because it contains an unexpected character in line 1 and column 15. | 
		Reference in New Issue
	
	Block a user