Cleanup ftdetect

7 files changed, 193 insertions, 36 deletions

diff --git a/README.md b/README.md
index d5e066bc..601e9394 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (syntax)
 - [go](https://github.com/fatih/vim-go) (syntax, indent, doc, compiler)
 - [gradle](https://github.com/tfnico/vim-gradle) (compiler)
-- [graphql](https://github.com/jparise/vim-graphql) (syntax, indent, autoload, ftplugin, after)
+- [graphql](https://github.com/jparise/vim-graphql) (syntax, indent, autoload, ftplugin, after, doc)
 - [haml](https://github.com/sheerun/vim-haml) (syntax, indent, compiler, ftplugin)
 - [handlebars](https://github.com/sheerun/vim-mustache-handlebars) (syntax, indent, ftplugin)
 - [haproxy](https://github.com/CH-DanReif/haproxy.vim) (syntax)
@@ -109,7 +109,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [json](https://github.com/elzr/vim-json) (syntax, indent, ftplugin)
 - [jsonnet](https://github.com/google/vim-jsonnet) (syntax, doc, autoload, ftplugin)
 - [jst](https://github.com/briancollins/vim-jst) (syntax, indent)
-- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (autoload, after)
+- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (autoload, after, doc)
 - [julia](https://github.com/JuliaEditorSupport/julia-vim) (syntax, indent, doc, autoload, ftplugin)
 - [kotlin](https://github.com/udalov/kotlin-vim) (syntax, indent, ftplugin)
 - [ledger](https://github.com/ledger/vim-ledger) (syntax, indent, doc, compiler, autoload)
diff --git a/doc/graphql.txt b/doc/graphql.txt
new file mode 100644
index 00000000..3f41deaa
--- /dev/null
+++ b/doc/graphql.txt
@@ -0,0 +1,55 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+
+*graphql.txt* GraphQL plug-in for Vim                                *graphql*
+
+CONTENTS                                                    *graphql-contents*
+
+1. Introduction         |graphql-intro|
+2. JavaScript Support   |graphql-javascript|
+3. TypeScript Support   |graphql-typescript|
+
+
+INTRODUCTION                                                   *graphql-intro*
+
+This plugin provides GraphQL (http://graphql.org/) file detection, syntax
+highlighting, and indentation.
+
+
+JAVASCRIPT                                                *graphql-javascript*
+
+GraphQL syntax support in ES2015 template literals is provided. It works "out
+of the box" with Vim 8.2's JavaScript support. The extended syntax provided by
+the vim-javascript (https://github.com/pangloss/vim-javascript) plugin is also
+supported.
+
+                                                  *graphql-javascript-options*
+
+                                                   *g:graphql_javascript_tags*
+|g:graphql_javascript_tags|                                    list of strings
+
+  Default: `["gql", "graphql", "Relay.QL"]`
+
+  This variable lists the ES2015 template tag names that will be recognized as
+  containing GraphQL template literal strings.
+
+
+TYPESCRIPT                                                *graphql-typescript*
+
+Like |graphql-javascript|, GraphQL syntax support in ES2015 template literals
+is provided. It also works "out of the box" with Vim 8.2's TypeScript support,
+which is based on the yats (https://github.com/HerringtonDarkholme/yats.vim)
+plugin. For older versions, you can install yats directly.
+
+TypeScript syntax support also uses |graphql-javascript-options| to customize
+the list of recognized template tag names.
+
+REASONML                                                    *graphql-reasonml*
+
+GraphQL syntax support inside of ReasonML template strings using graphql-ppx
+is available when vim-reasonml (https://github.com/jordwalke/vim-reasonml) is
+also installed.
+
+------------------------------------------------------------------------------
+vim:tw=78:ft=help:norl:
+
+endif
diff --git a/doc/vim-jsx-pretty-doc.txt b/doc/vim-jsx-pretty-doc.txt
new file mode 100644
index 00000000..8ddc97f8
--- /dev/null
+++ b/doc/vim-jsx-pretty-doc.txt
@@ -0,0 +1,128 @@
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
+
+vim-jsx-pretty is syntax highlight for JSX (React.js).
+(https://github.com/MaxMEllon/vim-jsx-pretty)
+
+version 1.0.6
+Author: maxmellon<maxmellon1994@gmail.com>
+License: MIT
+
+About                                             |vim-jsx-pretty-about|
+Usage                                             |vim-jsx-pretty-usage|
+Install                                           |vim-jsx-pretty-install|
+Config                                            |vim-jsx-pretty-config|
+Detail                                            |vim-jsx-pretty-detail|
+License                                           |vim-jsx-pretty-license|
+Thanks                                            |vim-jsx-retty-thanks|
+Inspiration                                       |vim-jsx-pretty-inspiration|
+
+===============================================================================
+ABOUT                                                    *vim-jsx-pretty-about*
+
+*vim-jsx-pretty* is highlight and indentation JSX (React.js) syntax.
+
+Dependency Plugin:
+  - pangloss/vim-javascript
+
+===============================================================================
+USAGE                                                    *vim-jsx-pretty-usage*
+
+Just Install it.
+
+===============================================================================
+INSTALL                                                *vim-jsx-pretty-install*
+
+If you used plugin manager `vim-plug`, As follows. >
+
+  Plug 'pangloss/vim-javascript'  " dependency plugin
+  Plug 'maxmellon/vim-jsx-pretty'
+<
+===============================================================================
+CONFIG                                                  *vim-jsx-pretty-config*
+
+- config list
+>
+  |                  name                 | default |        detail        |
+  |---------------------------------------|---------|----------------------|
+  | g:vim_jsx_pretty_enable_jsx_highlight |    1    | jsx highlight flag   |
+  | g:vim_jsx_pretty_colorful_config      |    0    | colorful config flag |
+<
+
+- *g:vim_jsx_pretty_enable_jsx_highlight*
+
+If you set 'g:vim_jsx_pretty_enable_jsx_highlight', Disable jsx highlight.
+But highlight group is set to jsx syntax. So you should set manual
+highlight setting.
+
+  - Example: >
+
+    let g:vim_jsx_pretty_enable_jsx_highlight = 0
+
+    highlight def link jsxTag Function
+    highlight def link jsxTagName Function
+    highlight def link jsxString String
+    highlight def link jsxNameSpace Function
+    highlight def link jsxComment Error
+    highlight def link jsxAttrib Type
+    highlight def link jsxCloseTag Identifier
+    highlight def link jsxCloseString Identifier
+
+- *g:vim_jsx_pretty_colorful_config*
+
+If you set 'g:vim_jsx_pretty_colorful_config', Enable colorful config.
+
+===============================================================================
+DETAIL                                                  *vim-jsx-pretty-detail*
+
+- Syntax group list
+>
+  |     name     |       match        |              |                    |
+  |--------------|--------------------|--------------|--------------------|
+  | jsxTag       | `<tag id="sample">`| jsxjsxAttrib | `<tag id="sample">`|
+  |              | `~~~~~~~~~~~~~~~~~`|              | `_____~~__________`|
+  |--------------|--------------------|--------------|--------------------|
+  | jsxTagName   | `<tag id="sample">`| jsxEqual     | `<tag id="sample">`|
+  |              | `_~~~_____________`|              | `_______~_________`|
+  |--------------|--------------------|--------------|--------------------|
+  | jsxString    | `<tag id="sample">`| jsxCloseTag  | `</tag> ｜ <tag />`|
+  |              | `________~~~~~~~~_`|              | `~~~~~~ ｜  _____~~|
+  |--------------|--------------------|--------------|--------------------|
+
+===============================================================================
+LICENSE                                                *vim-jsx-pretty-license*
+
+Copyright (c) 2016-2017 MaxMEllon
+MIT License
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+==============================================================================
+THANKS                                                  *vim-jsx-pretty-thanks*
+
+  - yuezk
+  - y0za
+  - cormacrelf
+
+===============================================================================
+INSPIREATION                                       *vim-jsx-pretty-inspiration*
+
+  - vim-jsx
+    See: https://github.com/mxw/vim-jsx
+
+ vim:tw=78:ts=8:ft=help:norl:
+
+endif
diff --git a/doc/vim-polyglot.txt b/doc/vim-polyglot.txt
deleted file mode 100644
index 5a804998..00000000
--- a/doc/vim-polyglot.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-*vim-polyglot*  Vim Polyglot
-
-===============================================================================
-                                                    *vim-polyglot-introduction*
-Introduction ~
-
-Vim Polyglot is a solid language pack for vim. No configuration needed.
-
-Please make sure you have `syntax on` in your `.vimrc`
-
-
-===============================================================================
-DISABLING LANGUAGE PACKS                                *vim-polyglot-disabled*
-
-
-Individual language packs can be disabled by setting `g:polyglot_disabled`:
-
->
-    " ~/.vimrc, declare this variable before polyglot is loaded let
-    g:polyglot_disabled = ['css']
-<
-
-Note that disabling languages won't make in general your vim startup any faster
-/ slower (only for specific file type). Vim-polyglot is selection of language
-plugins that are loaded only on demand.
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 016f1542..2271f1ed 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -136,7 +136,6 @@ if index(g:polyglot_disabled, 'coffee-script') == -1
   au BufNewFile,BufRead *._coffee set ft=coffee
   au BufNewFile,BufRead *.cake setf coffee
   au BufNewFile,BufRead *.cjsx set ft=coffee
-  au BufNewFile,BufRead *.ck set ft=coffee
   au BufNewFile,BufRead *.coffee set ft=coffee
   au BufNewFile,BufRead *.coffeekup set ft=coffee
   au BufNewFile,BufRead *.iced set ft=coffee
@@ -163,7 +162,6 @@ endif
 
 if index(g:polyglot_disabled, 'csv') == -1
   au BufNewFile,BufRead *.csv set ft=csv
-  au BufNewFile,BufRead *.dat set ft=csv
   au BufNewFile,BufRead *.tab set ft=csv
   au BufNewFile,BufRead *.tsv set ft=csv
 endif
@@ -501,10 +499,8 @@ if index(g:polyglot_disabled, 'jsonnet') == -1
 endif
 
 if index(g:polyglot_disabled, 'jst') == -1
-  au BufNewFile,BufRead *.djs set ft=jst
   au BufNewFile,BufRead *.ect set ft=jst
   au BufNewFile,BufRead *.ejs set ft=jst
-  au BufNewFile,BufRead *.hamljs set ft=jst
   au BufNewFile,BufRead *.jst set ft=jst
 endif
 
@@ -982,6 +978,7 @@ if index(g:polyglot_disabled, 'sh') == -1
   au BufNewFile,BufRead *.bats set ft=sh
   au BufNewFile,BufRead *.cgi setf sh
   au BufNewFile,BufRead *.command set ft=sh
+  au BufNewFile,BufRead *.env set ft=sh
   au BufNewFile,BufRead *.fcgi setf sh
   au BufNewFile,BufRead *.ksh set ft=sh
   au BufNewFile,BufRead *.sh set ft=sh
@@ -994,6 +991,9 @@ if index(g:polyglot_disabled, 'sh') == -1
   au BufNewFile,BufRead {.,}bash_profile set ft=sh
   au BufNewFile,BufRead {.,}bashrc set ft=sh
   au BufNewFile,BufRead {.,}cshrc set ft=sh
+  au BufNewFile,BufRead {.,}env set ft=sh
+  au BufNewFile,BufRead {.,}env.example set ft=sh
+  au BufNewFile,BufRead {.,}flaskenv set ft=sh
   au BufNewFile,BufRead {.,}login set ft=sh
   au BufNewFile,BufRead {.,}profile set ft=sh
   au BufNewFile,BufRead 9fs set ft=sh
diff --git a/packages.yaml b/packages.yaml
index dc056fbf..8e60e801 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -88,11 +88,12 @@ filetypes:
 - name: coffee
   linguist: CoffeeScript
   extra_extensions:
+  # 17 results: https://github.com/search?q=extension%3Acoffeekup+html&type=Code
   - coffeekup
-  - ck
 - name: litcoffee
   linguist: Literate CoffeeScript
   extra_extensions:
+# ? results: https://github.com/search?q=extension%3Acoffee.md+require&type=Code (probably search is broken)
   - coffee.md
 ---
 name: cjsx
@@ -127,7 +128,6 @@ filetypes:
   linguist: CSV
   extra_extensions:
   - tsv
-  - dat
   - tab
 ---
 name: cucumber
@@ -136,6 +136,7 @@ filetypes:
 - name: cucumber
   linguist: Gherkin
   extra_extensions:
+  # https://github.com/search?q=extension%3Astory+when&type=Code
   - story
 ---
 name: cue
@@ -526,8 +527,6 @@ filetypes:
   linguist: EJS
   extra_extensions:
   - jst
-  - djs
-  - hamljs
   - ect
 ---
 name: jsx
diff --git a/scripts/build b/scripts/build
index 099dc616..6d1749a6 100755
--- a/scripts/build
+++ b/scripts/build
@@ -15,7 +15,7 @@ BASE_URL = 'https://raw.githubusercontent.com/github/linguist/master'
 
 DIRS = {
   default: %w(syntax indent doc compiler autoload ftplugin ctags after/syntax after/indent after/ftplugin),
-  all: %w(syntax indent compiler autoload ftplugin after extras ctags),
+  all: %w(syntax indent compiler autoload ftplugin after extras ctags doc),
   syntax: %w(syntax indent after/syntax after/indent)
 }