Merge pull request #31 from facelessuser/better-vc-check

Quicker VC check

.pyspelling.yml

@@ -0,0 +1,120 @@
+matrix:
+- name: settings
+  sources:
+  - '**/*.sublime-settings'
+  hunspell:
+    d: en_US
+  aspell:
+    lang: en
+  dictionary:
+    wordlists:
+    - docs/src/dictionary/en-custom.txt
+    output: build/dictionary/settings.dic
+  pipeline:
+  - pyspelling.filters.cpp:
+      prefix: 'st'
+      generic_mode: true
+      group_comments: true
+      line_comments: false
+  - pyspelling.filters.context:
+      context_visible_first: true
+      escapes: '\\[\\`]'
+      delimiters:
+      # Ignore multiline content between fences (fences can have 3 or more back ticks)
+      # ```
+      # content
+      # ```
+      - open: '(?s)^(?P<open> *`{3,})$'
+        close: '^(?P=open)$'
+      # Ignore text between inline back ticks
+      - open: '(?P<open>`+)'
+        close: '(?P=open)'
+  - pyspelling.filters.url:
+
+- name: mkdocs
+  sources:
+  - site/**/*.html
+  hunspell:
+    d: en_US
+  aspell:
+    lang: en
+  dictionary:
+    wordlists:
+    - docs/src/dictionary/en-custom.txt
+    output: build/dictionary/mkdocs.dic
+  pipeline:
+  - pyspelling.filters.html:
+      comments: false
+      attributes:
+      - title
+      - alt
+      ignores:
+      - ':matches(code, pre)'
+      - 'a:matches(.magiclink-compare, .magiclink-commit, .magiclink-repository)'
+      - 'span.keys'
+      - ':matches(.MathJax_Preview, .md-nav__link, .md-footer-custom-text, .md-source__repository, .headerlink, .md-icon)'
+  - pyspelling.filters.url:
+
+- name: markdown
+  sources:
+  - readme.md
+  hunspell:
+    d: en_US
+  aspell:
+    lang: en
+  dictionary:
+    wordlists:
+    - docs/src/dictionary/en-custom.txt
+    output: build/dictionary/markdown.dic
+  pipeline:
+  - pyspelling.filters.markdown:
+  - pyspelling.filters.html:
+      comments: false
+      attributes:
+      - title
+      - alt
+      ignores:
+      - ':matches(code, pre)'
+  - pyspelling.filters.url:
+
+- name: python
+  hidden: true
+  sources:
+  - './**/*.py'
+  hunspell:
+    d: en_US
+  aspell:
+    lang: en
+  dictionary:
+    wordlists:
+    - docs/src/dictionary/en-custom.txt
+    output: build/dictionary/python.dic
+  pipeline:
+  - pyspelling.filters.python:
+      group_comments: true
+  - pyspelling.flow_control.wildcard:
+      allow:
+      - py-comment
+  - pyspelling.filters.context:
+      context_visible_first: true
+      delimiters:
+      # Ignore lint (noqa) and coverage (pragma) as well as shebang (#!)
+      - open: '^(?: *(?:noqa\b|pragma: no cover)|!)'
+        close: '$'
+      # Ignore Python encoding string -*- encoding stuff -*-
+      - open: '^ *-\*-'
+        close: '-\*-$'
+  - pyspelling.filters.context:
+      context_visible_first: true
+      escapes: '\\[\\`]'
+      delimiters:
+      # Ignore multiline content between fences (fences can have 3 or more back ticks)
+      # ```
+      # content
+      # ```
+      - open: '(?s)^(?P<open> *`{3,})$'
+        close: '^(?P=open)$'
+      # Ignore text between inline back ticks
+      - open: '(?P<open>`+)'
+        close: '(?P=open)'
+  - pyspelling.filters.url:

.travis.yml

@@ -4,7 +4,7 @@ language: python
 
 matrix:
   include:
-  - python: 3.3
+  - python: 3.6
     env: TESTENV=unittest
   - python: 3.6
     env: TESTENV=documents
@@ -19,6 +19,7 @@ install:
   - pip install mkdocs-material
   - pip install pymdown-extensions
   - pip install pygments
+  - pip install pyspelling
 
 addons:
   apt:
@@ -29,8 +30,8 @@ addons:
 script:
   - if [ $TESTENV = unittest ]; then py.test .; fi
   - if [ $TESTENV = unittest ]; then flake8 .; fi
-  - if [ $TESTENV = documents ]; then python tests/spellcheck.py; fi
   - if [ $TESTENV = documents ]; then mkdocs build --clean --verbose --strict; fi
+  - if [ $TESTENV = documents ]; then pyspelling; fi
 
 deploy:
   - provider: pages

CHANGES.md

@@ -1,32 +1,26 @@
-# EasyDiff 2.0.4
+# EasyDiff 2.0.5
+
+- **FIX**: Lag during version control binary check.
 
-> Released Mar 16, 2018
+# EasyDiff 2.0.4
 
 - **FIX**: Fix view index issue.
 
 # EasyDiff 2.0.3
 
-> Released Feb 5, 2017
-
 - **FIX**: More unique name for generated version control files #26.
 
 # EasyDiff 2.0.2
 
-> Released Nov 19, 2017
-
 - **FIX**: Log rendering.
 
 # EasyDiff 2.0.1
 
-> Released Nov 19, 2017
-
 - **FIX**: Remove workarounds.
 - **FIX**: Update dependencies to the latest.
 
 # EasyDiff 2.0.0
 
-> Released May 28, 2017
-
 - **NEW**: Add new support commands.
 - **NEW**: Reduce menus down to a few commands.
 - **NEW**: Check version control binaries on first call to them instead of at plugin load.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 - 2017 Isaac Muse
+Copyright (c) 2013 - 2018 Isaac Muse
 
 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

README.md

@@ -21,7 +21,7 @@ http://facelessuser.github.io/EasyDiff/
 # License
 EasyDiff is released under the MIT license.
 
-Copyright (c) 2013 - 2015 Isaac Muse <[email protected]>
+Copyright (c) 2013 - 2018 Isaac Muse <[email protected]>
 
 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:
 

.dictionary → docs/src/dictionary/en-custom.txt

@@ -4,6 +4,7 @@ Ctrl
 DeltaWalker
 EasyDiff
 EasyDiff's
+EmojiOne
 Feb
 MERCHANTABILITY
 MkDocs

docs/src/markdown/_snippets/refs.txt

@@ -0,0 +1,4 @@
+--8<--
+links.txt
+abbr.txt
+--8<--

docs/src/markdown/contributing.md

@@ -102,4 +102,4 @@ A ton of time has been spent not only creating and supporting this plugin, but a
 
 You don't have to render the docs locally before pull requesting, but if you wish to, I currently use a combination of @mkdocs/mkdocs, the @squidfunk/mkdocs-material, and @facelessuser/pymdown-extensions to render the docs.  You can preview the docs if you install these two packages.  The command for previewing the docs is `mkdocs serve` from the root directory. You can then view the documents at `localhost:8000`.
 
---8<-- "refs.md"
+--8<-- "refs.txt"

docs/src/markdown/index.md

@@ -192,4 +192,4 @@ Occasionally, EasyDiff will about a message in the status bar. You can redirect
     "use_sub_notify": true
 ```
 
---8<-- "refs.md"
+--8<-- "refs.txt"

docs/src/markdown/installation.md

@@ -215,4 +215,4 @@ For those who want to install EasyDiff without package control, here are the ste
 
 3. Restart Sublime Text.
 
---8<-- "refs.md"
+--8<-- "refs.txt"

docs/src/markdown/license.md

@@ -2,7 +2,7 @@
 
 EasyDiff is released under the MIT license.
 
-Copyright (c) 2013 - 2017 Isaac Muse <[email protected]>
+Copyright (c) 2013 - 2018 Isaac Muse <[email protected]>
 
 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: