]> git.madduck.net Git - etc/vim.git/log

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

etc/vim.git
6 years agoAdd Gemfile.lock to .gitignore
Fergal Hainey [Fri, 20 Jan 2017 15:23:34 +0000 (15:23 +0000)]
Add Gemfile.lock to .gitignore

6 years agoMerge pull request #112 from blueyed/fix-97
Daniel Hahler [Thu, 26 Jul 2018 08:03:04 +0000 (10:03 +0200)]
Merge pull request #112 from blueyed/fix-97

Fix indenting of "else" with outer if

6 years agoSimplify s:find_start_of_block
Daniel Hahler [Thu, 26 Jul 2018 07:56:26 +0000 (09:56 +0200)]
Simplify s:find_start_of_block

6 years agoFix indenting of "else" with outer if
Daniel Hahler [Thu, 26 Jul 2018 07:35:30 +0000 (09:35 +0200)]
Fix indenting of "else" with outer if

Fixes https://github.com/Vimjas/vim-python-pep8-indent/issues/97.

6 years agoFix multiline handling with blank lines (#111)
Daniel Hahler [Thu, 26 Jul 2018 07:26:18 +0000 (09:26 +0200)]
Fix multiline handling with blank lines (#111)

6 years agoRemove dead s:pair_pos (#108)
Daniel Hahler [Tue, 24 Jul 2018 23:33:45 +0000 (01:33 +0200)]
Remove dead s:pair_pos (#108)

Its usage was removed in 782b0f0.

6 years agoMerge pull request #110 from blueyed/v8.1.0129
Daniel Hahler [Tue, 24 Jul 2018 23:23:28 +0000 (01:23 +0200)]
Merge pull request #110 from blueyed/v8.1.0129

tests: use Vim v8.1.0129 to work around Vim bug

6 years agoFix cython tests that successful due to Vim segfaulting and vimrunner not handling it
Daniel Hahler [Tue, 24 Jul 2018 23:19:51 +0000 (01:19 +0200)]
Fix cython tests that successful due to Vim segfaulting and vimrunner not handling it

6 years agotests: use Vim v8.1.0129 to work around Vim bug
Daniel Hahler [Tue, 24 Jul 2018 22:59:20 +0000 (00:59 +0200)]
tests: use Vim v8.1.0129 to work around Vim bug

This works around a segfault with profiling.

Ref: https://github.com/vim/vim/commit/ad6480961080f80a455b2394f27b02935a2ded52#commitcomment-29790223

6 years agoREADME: update badges: CircleCI/Codecov
Daniel Hahler [Sun, 22 Jul 2018 21:59:18 +0000 (23:59 +0200)]
README: update badges: CircleCI/Codecov

6 years agoAddress Flake8's E127 with "if (" (#102)
Daniel Hahler [Sun, 22 Jul 2018 21:54:26 +0000 (23:54 +0200)]
Address Flake8's E127 with "if (" (#102)

> continuation line over-indented for visual indent

It appears that the "if (" is just the 4 columns wide that triggers the
extra indent with sw=4.

Might also change/adjust b:control_statement to ignore `if (`, but this
appears to be more flexible/correct.

6 years agotests: fix vim.kill: use <CR> (#109)
Daniel Hahler [Sat, 21 Jul 2018 20:22:15 +0000 (22:22 +0200)]
tests: fix vim.kill: use <CR> (#109)

6 years agoCoverage reporting via covimerage (#107)
Daniel Hahler [Sat, 21 Jul 2018 20:07:45 +0000 (22:07 +0200)]
Coverage reporting via covimerage (#107)

This splits out the tests for cython, since the runtime file gets
reloaded for them, and that resets profiling information.

6 years agoUse Docker for easier test running (#86)
Daniel Hahler [Sat, 21 Jul 2018 07:02:47 +0000 (09:02 +0200)]
Use Docker for easier test running (#86)

Switches to CircleCI instead of Travis, which handles running tests in
Docker much better, especially since Travis is really slow (~30min vs
2.5min on CircleCI).

The Docker image is based on
https://github.com/tweekmonster/vim-testbed, and targets are added to
the Makefile to build/push it.

6 years agotests: remove nil from hang-closing tests (#105)
Daniel Hahler [Tue, 17 Jul 2018 22:37:40 +0000 (00:37 +0200)]
tests: remove nil from hang-closing tests (#105)

There is not much value in running all tests with it to see that the
default is used.

6 years agoTravis: do not pin rvm (#103)
Daniel Hahler [Mon, 16 Jul 2018 18:02:16 +0000 (20:02 +0200)]
Travis: do not pin rvm (#103)

6 years agoTravis: remove vint for now
Daniel Hahler [Mon, 16 Jul 2018 18:00:35 +0000 (20:00 +0200)]
Travis: remove vint for now

It is always failing, not worth fixing for now.

Ref: https://github.com/Kuniwak/vint/pull/288
Ref: https://github.com/Kuniwak/vint/issues/287

6 years agoGemfile: update vimrunner to 0.3.4 (#104)
Daniel Hahler [Mon, 16 Jul 2018 17:55:51 +0000 (19:55 +0200)]
Gemfile: update vimrunner to 0.3.4 (#104)

6 years agoREADME: add Troubleshooting section
Daniel Hahler [Sun, 15 Jul 2018 19:31:38 +0000 (21:31 +0200)]
README: add Troubleshooting section

Fixes https://github.com/Vimjas/vim-python-pep8-indent/issues/75.

6 years agoAdd option for hanging closing brackets (#94)
Jake Harr [Sun, 15 Jul 2018 19:11:26 +0000 (15:11 -0400)]
Add option for hanging closing brackets (#94)

The main idea is discussed at length in PyCQA/pycodestyle#103.

* Add tests for `python_pep8_indent_hang_closing`

This might be overkill. It reruns the current "vim" set of tests once
for each value of the new setting. Of course, this makes the test suite
take longer to run. I couldn't think of a good way to factor out the
relevant test cases without creating a mess.

7 years agoRevert "Improve s:find_start_of_multiline_statement: only look for round parens"...
Daniel Hahler [Fri, 17 Nov 2017 13:58:22 +0000 (14:58 +0100)]
Revert "Improve s:find_start_of_multiline_statement: only look for round parens" (#95)

This reverts commit 922268fbd89a49991b5b5b73e969f8daa8a10263.

Add a regression test.

Conflicts:
indent/python.vim

7 years agoMerge pull request #91 from Vimjas/maxoff-by-type
Daniel Hahler [Thu, 16 Nov 2017 17:47:52 +0000 (18:47 +0100)]
Merge pull request #91 from Vimjas/maxoff-by-type

Intermediate fix for indenting huge dicts

7 years agouse 50 for round parens, add tests
Daniel Hahler [Thu, 16 Nov 2017 16:28:46 +0000 (17:28 +0100)]
use 50 for round parens, add tests

7 years agoImprove s:find_start_of_multiline_statement: only look for round parens
Daniel Hahler [Mon, 9 Oct 2017 02:18:35 +0000 (04:18 +0200)]
Improve s:find_start_of_multiline_statement: only look for round parens

7 years agos:find_opening_paren: use known nearest for stopline
Daniel Hahler [Thu, 5 Oct 2017 21:20:50 +0000 (23:20 +0200)]
s:find_opening_paren: use known nearest for stopline

7 years agoIntermediate fix for indenting huge dicts
Daniel Hahler [Thu, 5 Oct 2017 21:12:24 +0000 (23:12 +0200)]
Intermediate fix for indenting huge dicts

This uses different offsets for the type of pairs: '()' and '[]' will
only look for just 20 lines above, while 1000 lines are used for '{}',
which might be a huge dict.

Ref: https://github.com/Vimjas/vim-python-pep8-indent/pull/64.

7 years agoImprove tests (#93)
Daniel Hahler [Sat, 7 Oct 2017 19:45:40 +0000 (21:45 +0200)]
Improve tests (#93)

* Travis: use "make test"

* Travis: do not start Xvfb

* Makefile: make test fast, add test_slow

7 years agotests: explicitly enable old "should" syntax to fix deprecation warnings (#92)
Daniel Hahler [Sat, 7 Oct 2017 19:29:10 +0000 (21:29 +0200)]
tests: explicitly enable old "should" syntax to fix deprecation warnings (#92)

> Deprecation Warnings:
>
> Using `should` from rspec-expectations' old `:should` syntax without
> explicitly enabling the syntax is deprecated. Use the new `:expect`
> syntax or explicitly enable `:should` with `config.expect_with(:rspec) {
> |c| c.syntax = :should }` instead. Called from
> …/vim-python-pep8-indent/spec/indent/indent_spec.rb:141:in
> `block (3 levels) in <top (required)>'.

7 years agoIndent next line if prev line is empty (+tests) (#88)
Ivan Smirnov [Mon, 21 Aug 2017 15:59:17 +0000 (16:59 +0100)]
Indent next line if prev line is empty (+tests) (#88)

7 years agoTravis: update config (#87)
Daniel Hahler [Sun, 30 Jul 2017 14:34:15 +0000 (16:34 +0200)]
Travis: update config (#87)

* Travis: update config based on splitjoin's config
* rvm: 2.4.1
* Add VIMRUNNER_REUSE_SERVER, and a wrapper Makefile
* Travis: VIMRUNNER_REUSE_SERVER=1
* Start Xvfb manually

7 years agotests: insert blank lines before each test (#89)
Daniel Hahler [Sun, 30 Jul 2017 14:17:23 +0000 (16:17 +0200)]
tests: insert blank lines before each test (#89)

This is required with reuse_server.

7 years agoREADME: add g: prefix to config section
Daniel Hahler [Sat, 29 Jul 2017 13:43:28 +0000 (15:43 +0200)]
README: add g: prefix to config section

7 years agoUpgrade vimrunner to 0.3.3 (#85)
Daniel Hahler [Sat, 29 Jul 2017 13:28:39 +0000 (15:28 +0200)]
Upgrade vimrunner to 0.3.3 (#85)

7 years agoTravis: run vint, build only master branch
Daniel Hahler [Sat, 29 Jul 2017 12:50:37 +0000 (14:50 +0200)]
Travis: run vint, build only master branch

7 years agoLint fixes (vint)
Daniel Hahler [Sat, 29 Jul 2017 12:35:28 +0000 (14:35 +0200)]
Lint fixes (vint)

7 years agoDo not set expandtab, (soft)tabstop, shiftwidth (#83)
Daniel Hahler [Sat, 29 Jul 2017 13:10:07 +0000 (15:10 +0200)]
Do not set expandtab, (soft)tabstop, shiftwidth (#83)

It is not the job of an indent plugin to set those.

Closes https://github.com/Vimjas/vim-python-pep8-indent/pull/70.
Closes https://github.com/Vimjas/vim-python-pep8-indent/pull/80.

7 years agoIndent empty lines inside blocks (#81)
Ivan Smirnov [Sat, 29 Jul 2017 13:09:18 +0000 (14:09 +0100)]
Indent empty lines inside blocks (#81)

7 years agoAdd a symlink for cython (#74)
Daniel Hahler [Sat, 29 Jul 2017 12:24:37 +0000 (14:24 +0200)]
Add a symlink for cython (#74)

Fixes https://github.com/Vimjas/vim-python-pep8-indent/issues/73.

7 years agoTake over maintainership, move it to Vimjas org
Daniel Hahler [Sat, 28 Jan 2017 23:13:41 +0000 (00:13 +0100)]
Take over maintainership, move it to Vimjas org

8 years agofix multiline strings when breaking a string after opening parenthesis (#58)
Daniel Hahler [Sat, 3 Sep 2016 01:27:55 +0000 (03:27 +0200)]
fix multiline strings when breaking a string after opening parenthesis (#58)

8 years agoFix indentation of "else" in nested "if" (#59)
Daniel Hahler [Sat, 3 Sep 2016 01:27:43 +0000 (03:27 +0200)]
Fix indentation of "else" in nested "if" (#59)

Fixes https://github.com/hynek/vim-python-pep8-indent/issues/56.

8 years agospec_helper: pass in already obtained line (#60)
Daniel Hahler [Sat, 3 Sep 2016 00:11:55 +0000 (02:11 +0200)]
spec_helper: pass in already obtained line (#60)

The tests are quite slow, and I have the feeling that most comes from
the helpers, and more importantly not reusing the Vim instance (because
of the lockup issue).

8 years agoUpdate vimrunner: 0.3.1 => 0.3.2 (#57)
Daniel Hahler [Fri, 2 Sep 2016 23:57:46 +0000 (01:57 +0200)]
Update vimrunner: 0.3.1 => 0.3.2 (#57)

8 years agoImprove handling of multiline strings (#50)
Daniel Hahler [Wed, 6 Jul 2016 09:17:48 +0000 (11:17 +0200)]
Improve handling of multiline strings (#50)

* Improve handling of multiline strings

Fixes https://github.com/hynek/vim-python-pep8-indent/issues/49.

* tests: use an uneven width (3) instead of 8

This makes sure that the tests work as expected.

* tests: move helper functions to spec_helper.rb

* Add python_pep8_indent_for_multiline_string setting

Ref: https://github.com/hynek/vim-python-pep8-indent/issues/49#issuecomment-228581896

* Use indent directly if prevnonblank is known

This removes the now unused s:indent_prevnonblank function.

8 years agoFix keeping indent with 'else' for 'if' after 'try-except' (#52)
Daniel Hahler [Mon, 4 Jul 2016 04:32:30 +0000 (06:32 +0200)]
Fix keeping indent with 'else' for 'if' after 'try-except' (#52)

Fixes https://github.com/hynek/vim-python-pep8-indent/issues/47.

8 years agoMerge pull request #54 from blueyed/fix-typo
Hynek Schlawack [Sun, 3 Jul 2016 11:19:59 +0000 (13:19 +0200)]
Merge pull request #54 from blueyed/fix-typo

Doc fixes

8 years agoMerge pull request #53 from blueyed/factor-out-dedented-already
Hynek Schlawack [Sun, 3 Jul 2016 11:17:31 +0000 (13:17 +0200)]
Merge pull request #53 from blueyed/factor-out-dedented-already

Factor out is_dedented_already

8 years agoRemove AUTHORS, link to contributors on GitHub
Daniel Hahler [Sun, 3 Jul 2016 11:15:37 +0000 (13:15 +0200)]
Remove AUTHORS, link to contributors on GitHub

8 years agoUppercase Vim
Daniel Hahler [Sun, 3 Jul 2016 11:14:28 +0000 (13:14 +0200)]
Uppercase Vim

8 years agoFix typo: s/it with/with
Daniel Hahler [Sun, 3 Jul 2016 11:13:43 +0000 (13:13 +0200)]
Fix typo: s/it with/with

8 years agoFactor out is_dedented_already
Daniel Hahler [Sun, 3 Jul 2016 11:09:49 +0000 (13:09 +0200)]
Factor out is_dedented_already

Not really necessary, but I did it when using it somewhere else
initially, and it might be more readable after all.

8 years agoAdd Cython support (#48)
Antony Lee [Tue, 21 Jun 2016 18:28:51 +0000 (11:28 -0700)]
Add Cython support (#48)

Just making indents after cdef and cpdef similar to def.  The variable
must be made buffer-local in case one is editing both Python and Cython
sources at the same time.

9 years agoFix regression with colon-at-eol detection (#44)
Daniel Hahler [Sat, 23 May 2015 22:24:22 +0000 (00:24 +0200)]
Fix regression with colon-at-eol detection (#44)

Instead of using `search` it now goes back and breaks if a char is found
that should not get skipped.

Fixes https://github.com/hynek/vim-python-pep8-indent/issues/44
Closes https://github.com/hynek/vim-python-pep8-indent/issues/45

9 years agoMerge pull request #41 from blueyed/fix-jedi-call-signatures
Daniel Hahler [Tue, 12 May 2015 16:24:52 +0000 (18:24 +0200)]
Merge pull request #41 from blueyed/fix-jedi-call-signatures

Handle jedi-vim call signatures when looking for colon in prev line

9 years agoImprove handling of lookup in previous lines
Daniel Hahler [Wed, 6 May 2015 13:12:26 +0000 (15:12 +0200)]
Improve handling of lookup in previous lines

 - Handle jedi-vim call signatures when looking for colon and function
   def in previous line.
   This adds `jedi\S` to s:skip_special_chars and improves the algorithm to
   find the colon in the previous line in `s:indent_like_previous_line`.
 - Add `s:match_expr_on_line` and use it for `nothing_after_opening_paren`.
 - Handle comments after opening paren (#32).

NOTE: This handles older Vim versions, where `synconcealed` behaves different
(returns an empty list for non-concealed) and `getcurpos` is not
available (Vim 7.3.429 (used on Travis)).

Fixes: https://github.com/hynek/vim-python-pep8-indent/issues/32
9 years agoVimrunner: doc for config.reuse_server=false
Daniel Hahler [Wed, 6 May 2015 14:30:12 +0000 (16:30 +0200)]
Vimrunner: doc for config.reuse_server=false

I've tried to set it to true by default, but it is still buggy.

9 years agoUpdate vimrunner to 0.3.1
Daniel Hahler [Wed, 6 May 2015 15:36:59 +0000 (17:36 +0200)]
Update vimrunner to 0.3.1

9 years agoTravis: display vim --version
Daniel Hahler [Wed, 6 May 2015 13:57:16 +0000 (15:57 +0200)]
Travis: display vim --version

9 years agoMerge pull request #42 from blueyed/more-indent-function-def
Daniel Hahler [Thu, 7 May 2015 15:21:45 +0000 (17:21 +0200)]
Merge pull request #42 from blueyed/more-indent-function-def

Add more indentation after function definition

9 years agoAdd more indentation after function/class definition
Daniel Hahler [Wed, 6 May 2015 16:07:18 +0000 (18:07 +0200)]
Add more indentation after function/class definition

Fixes https://github.com/hynek/vim-python-pep8-indent/issues/30

9 years agoFix indenting of strings, especially after opening paren
Daniel Hahler [Fri, 27 Feb 2015 17:17:37 +0000 (18:17 +0100)]
Fix indenting of strings, especially after opening paren

Fixes https://github.com/hynek/vim-python-pep8-indent/issues/36
Closes https://github.com/hynek/vim-python-pep8-indent/pull/37

9 years agoMerge pull request #40 from blueyed/fix-comment
Hynek Schlawack [Wed, 6 May 2015 11:15:00 +0000 (13:15 +0200)]
Merge pull request #40 from blueyed/fix-comment

Fix comment for s:skip_search usage

9 years agoFix comment for s:skip_search usage
Daniel Hahler [Wed, 6 May 2015 10:56:19 +0000 (12:56 +0200)]
Fix comment for s:skip_search usage

This was overseen in 47ab0458.

9 years agoMerge pull request #39 from blueyed/fix-indent
Hynek Schlawack [Tue, 3 Mar 2015 11:12:28 +0000 (12:12 +0100)]
Merge pull request #39 from blueyed/fix-indent

minor style: fix indenting for multiline statement

9 years agoMerge pull request #38 from blueyed/doc-fix-sw-note
Hynek Schlawack [Tue, 3 Mar 2015 10:47:28 +0000 (11:47 +0100)]
Merge pull request #38 from blueyed/doc-fix-sw-note

doc: fix comment about 'sw': 0 is used to follow 'ts'

9 years agodoc: fix comment about 'sw': 0 is used to follow 'ts'
Daniel Hahler [Fri, 27 Feb 2015 17:54:57 +0000 (18:54 +0100)]
doc: fix comment about 'sw': 0 is used to follow 'ts'

9 years agominor style: fix indenting for multiline statement
Daniel Hahler [Fri, 27 Feb 2015 17:58:12 +0000 (18:58 +0100)]
minor style: fix indenting for multiline statement

10 years agoMerge pull request #35 from tgs/master
Hynek Schlawack [Fri, 21 Nov 2014 17:40:52 +0000 (18:40 +0100)]
Merge pull request #35 from tgs/master

Fix demo indentation

10 years agoFix demo indentation
Thomas Smith [Fri, 21 Nov 2014 16:15:30 +0000 (11:15 -0500)]
Fix demo indentation

10 years agoMerge branch 'pr/34'
Hynek Schlawack [Mon, 8 Sep 2014 10:39:09 +0000 (12:39 +0200)]
Merge branch 'pr/34'

Fixes #25
Fixes #34

10 years agoApply more polish
Hynek Schlawack [Mon, 8 Sep 2014 10:35:27 +0000 (12:35 +0200)]
Apply more polish

10 years agoAdd more licensing stuff
Hynek Schlawack [Mon, 8 Sep 2014 10:29:16 +0000 (12:29 +0200)]
Add more licensing stuff

10 years agoPolish the docs a bit
Hynek Schlawack [Mon, 8 Sep 2014 10:23:05 +0000 (12:23 +0200)]
Polish the docs a bit

10 years agoRevert back to using RST
Bryan Bennett [Sat, 6 Sep 2014 19:01:42 +0000 (15:01 -0400)]
Revert back to using RST

10 years agoUpdate AUTHORS.rst
Bryan Bennett [Fri, 5 Sep 2014 17:19:43 +0000 (13:19 -0400)]
Update AUTHORS.rst

10 years agoRST -> MD and add references to other installers
Bryan Bennett [Fri, 5 Sep 2014 17:18:19 +0000 (13:18 -0400)]
RST -> MD and add references to other installers

Added info for installing via NeoBundle and Vundle.

10 years agoRename README.rst to README.md
Bryan Bennett [Fri, 5 Sep 2014 17:00:34 +0000 (13:00 -0400)]
Rename README.rst to README.md

10 years agoFix indenting of strings between brackets
Jelte Fennema [Tue, 8 Jul 2014 14:16:11 +0000 (16:16 +0200)]
Fix indenting of strings between brackets

Add unit test

Add myself to authors

10 years agoMerge pull request #26 from dantesun/master
Hynek Schlawack [Fri, 27 Jun 2014 09:55:45 +0000 (11:55 +0200)]
Merge pull request #26 from dantesun/master

set shiftwidth,tabstop and softtabstop to 4

Fixes #9 too.

10 years agoset shiftwidth,tabstop and softtabstop to 4
Dante Sun [Thu, 15 May 2014 10:58:01 +0000 (18:58 +0800)]
set shiftwidth,tabstop and softtabstop to 4

10 years agoMerge pull request #24 from has2k1/fix-indent-eagerness
Hynek Schlawack [Sun, 6 Apr 2014 12:28:27 +0000 (14:28 +0200)]
Merge pull request #24 from has2k1/fix-indent-eagerness

Refix issue #5 (Correct indent after end of block)

10 years agoFix test case introduced in last commit.
Hassan Kibirige [Mon, 24 Mar 2014 09:34:40 +0000 (04:34 -0500)]
Fix test case introduced in last commit.

10 years agoMake fix work even with of preceeding empty lines.
Hassan Kibirige [Sat, 22 Mar 2014 21:55:20 +0000 (16:55 -0500)]
Make fix work even with of preceeding empty lines.

Previous commit was not robust enough to catch the
same issue if there were empty lines between the
current line the previous block.

10 years agoRefix issue #5 (Correct indent after end of block)
Hassan Kibirige [Thu, 13 Mar 2014 09:50:20 +0000 (04:50 -0500)]
Refix issue #5 (Correct indent after end of block)

The implementation clean up reintroduced a more severe
version of the bug. Plus, the test was slightly deficient
to catch the regression.

Problem
-------
Given two adjacent blocks where the 2nd block has
an equal or smaller indentation level compared to the 1st
block. If the 1st block does not end in a stop statement
it always sucks up the 2nd block.

This changes the meaning of code that already adheres to the
pep8 standard.

Solution
--------
Do not inherit indentation of the previous line if the current line
has less indentation but is valid.

10 years agoMerge pull request #20 from kljohann/clean_up
Hynek Schlawack [Sun, 12 Jan 2014 12:53:44 +0000 (04:53 -0800)]
Merge pull request #20 from kljohann/clean_up

Clean up implementation

10 years agoprevent ':' from indenting inside unfinished string
Johann Klähn [Tue, 7 Jan 2014 16:28:46 +0000 (17:28 +0100)]
prevent ':' from indenting inside unfinished string

10 years agoprevent tests being shadowed by first line rule
Johann Klähn [Tue, 7 Jan 2014 16:53:17 +0000 (17:53 +0100)]
prevent tests being shadowed by first line rule

10 years agounindent 'else' after 'for' and 'try/except'
Johann Klähn [Fri, 3 Jan 2014 21:52:36 +0000 (22:52 +0100)]
unindent 'else' after 'for' and 'try/except'

10 years agofix regression for multiple parens of different types
Johann Klähn [Sun, 10 Nov 2013 08:03:50 +0000 (09:03 +0100)]
fix regression for multiple parens of different types

10 years agocorrectly indent after parens in control structures
Johann Klähn [Fri, 8 Nov 2013 19:53:33 +0000 (20:53 +0100)]
correctly indent after parens in control structures

fixes #7

10 years agoclean up implementation
Johann Klähn [Mon, 18 Mar 2013 21:38:15 +0000 (22:38 +0100)]
clean up implementation

10 years agoUnindent 'finally' after 'else' too
Hynek Schlawack [Fri, 3 Jan 2014 20:00:18 +0000 (21:00 +0100)]
Unindent 'finally' after 'else' too

10 years agoUn-indent for "else" after "for" and "try/except"
Hynek Schlawack [Fri, 3 Jan 2014 19:36:41 +0000 (20:36 +0100)]
Un-indent for "else" after "for" and "try/except"

Fixes #21

11 years agoMerge pull request #19 from kljohann/tests
Hynek Schlawack [Sat, 9 Nov 2013 15:08:57 +0000 (07:08 -0800)]
Merge pull request #19 from kljohann/tests

Run test cases for different sets of settings

While we care only about 4 spaces, running it with both may uncover subtle bugs.

11 years agorun test cases for different settings
Johann Klähn [Fri, 8 Nov 2013 19:52:17 +0000 (20:52 +0100)]
run test cases for different settings

11 years agoIndent correctly after lines with '#'s in strings
LeoMao [Sun, 21 Jul 2013 13:33:11 +0000 (21:33 +0800)]
Indent correctly after lines with '#'s in strings

Fixes #5.

11 years agoFix issue #5 (Correct indent after end of block)
has2k1 [Thu, 31 Oct 2013 10:17:16 +0000 (05:17 -0500)]
Fix issue #5 (Correct indent after end of block)

Problem
-------
Given two adjacent blocks where the 2nd block has
an equal or smaller indentation level compared to the 1st
block. If the blocks are not separated by an empty line,
the 2nd block will be placed (indented) inside the 1st
block.

This changes the meaning of code that already adheres to the
pep8 standard.

Solution
--------
Do not inherit indentation of the previous line if the current line
has less indentation but is valid.

11 years agoExpand Hassan's name
Hynek Schlawack [Tue, 29 Oct 2013 09:39:10 +0000 (10:39 +0100)]
Expand Hassan's name

11 years agoMerge pull request #16 from has2k1/commented-out-tests
Hynek Schlawack [Sun, 27 Oct 2013 18:03:58 +0000 (11:03 -0700)]
Merge pull request #16 from has2k1/commented-out-tests

Fix failing commented out tests

11 years agoFix failing commented out tests
has2k1 [Tue, 13 Aug 2013 03:47:02 +0000 (22:47 -0500)]
Fix failing commented out tests

Related commits
---------------
- #6e60ef0

Reason
------
The indent functions, in this case
      GetPythonPEPIndent()
can modify the cursor position. There is nothing wrong with that
consequence, vim takes it into account and restores the cursor
position (see References below). For the tests vim is not doing
the calling, so the cursor is not restored.

Solution
--------
Restore the cursor position after calling the indent function.