annotate runtime/indent/cdl.vim @ 32936:c517845bd10e v9.0.1776

patch 9.0.1776: No support for stable Python 3 ABI Commit: https://github.com/vim/vim/commit/c13b3d1350b60b94fe87f0761ea31c0e7fb6ebf3 Author: Yee Cheng Chin <ychin.git@gmail.com> Date: Sun Aug 20 21:18:38 2023 +0200 patch 9.0.1776: No support for stable Python 3 ABI Problem: No support for stable Python 3 ABI Solution: Support Python 3 stable ABI Commits: 1) Support Python 3 stable ABI to allow mixed version interoperatbility Vim currently supports embedding Python for use with plugins, and the "dynamic" linking option allows the user to specify a locally installed version of Python by setting `pythonthreedll`. However, one caveat is that the Python 3 libs are not binary compatible across minor versions, and mixing versions can potentially be dangerous (e.g. let's say Vim was linked against the Python 3.10 SDK, but the user sets `pythonthreedll` to a 3.11 lib). Usually, nothing bad happens, but in theory this could lead to crashes, memory corruption, and other unpredictable behaviors. It's also difficult for the user to tell something is wrong because Vim has no way of reporting what Python 3 version Vim was linked with. For Vim installed via a package manager, this usually isn't an issue because all the dependencies would already be figured out. For prebuilt Vim binaries like MacVim (my motivation for working on this), AppImage, and Win32 installer this could potentially be an issue as usually a single binary is distributed. This is more tricky when a new Python version is released, as there's a chicken-and-egg issue with deciding what Python version to build against and hard to keep in sync when a new Python version just drops and we have a mix of users of different Python versions, and a user just blindly upgrading to a new Python could lead to bad interactions with Vim. Python 3 does have a solution for this problem: stable ABI / limited API (see https://docs.python.org/3/c-api/stable.html). The C SDK limits the API to a set of functions that are promised to be stable across versions. This pull request adds an ifdef config that allows us to turn it on when building Vim. Vim binaries built with this option should be safe to freely link with any Python 3 libraies without having the constraint of having to use the same minor version. Note: Python 2 has no such concept and this doesn't change how Python 2 integration works (not that there is going to be a new version of Python 2 that would cause compatibility issues in the future anyway). --- Technical details: ====== The stable ABI can be accessed when we compile with the Python 3 limited API (by defining `Py_LIMITED_API`). The Python 3 code (in `if_python3.c` and `if_py_both.h`) would now handle this and switch to limited API mode. Without it set, Vim will still use the full API as before so this is an opt-in change. The main difference is that `PyType_Object` is now an opaque struct that we can't directly create "static types" out of, and we have to create type objects as "heap types" instead. This is because the struct is not stable and changes from version to version (e.g. 3.8 added a `tp_vectorcall` field to it). I had to change all the types to be allocated on the heap instead with just a pointer to them. Other functions are also simply missing in limited API, or they are introduced too late (e.g. `PyUnicode_AsUTF8AndSize` in 3.10) to it that we need some other ways to do the same thing, so I had to abstract a few things into macros, and sometimes re-implement functions like `PyObject_NEW`. One caveat is that in limited API, `OutputType` (used for replacing `sys.stdout`) no longer inherits from `PyStdPrinter_Type` which I don't think has any real issue other than minor differences in how they convert to a string and missing a couple functions like `mode()` and `fileno()`. Also fixed an existing bug where `tp_basicsize` was set incorrectly for `BufferObject`, `TabListObject, `WinListObject`. Technically, there could be a small performance drop, there is a little more indirection with accessing type objects, and some APIs like `PyUnicode_AsUTF8AndSize` are missing, but in practice I didn't see any difference, and any well-written Python plugin should try to avoid excessing callbacks to the `vim` module in Python anyway. I only tested limited API mode down to Python 3.7, which seemes to compile and work fine. I haven't tried earlier Python versions. 2) Fix PyIter_Check on older Python vers / type##Ptr unused warning For PyIter_Check, older versions exposed them as either macros (used in full API), or a function (for use in limited API). A previous change exposed PyIter_Check to the dynamic build because Python just moved it to function-only in 3.10 anyway. Because of that, just make sure we always grab the function in dynamic builds in earlier versions since that's what Python eventually did anyway. 3) Move Py_LIMITED_API define to configure script Can now use --with-python-stable-abi flag to customize what stable ABI version to target. Can also use an env var to do so as well. 4) Show +python/dyn-stable in :version, and allow has() feature query Not sure if the "/dyn-stable" suffix would break things, or whether we should do it another way. Or just don't show it in version and rely on has() feature checking. 5) Documentation first draft. Still need to implement v:python3_version 6) Fix PyIter_Check build breaks when compiling against Python 3.8 7) Add CI coverage stable ABI on Linux/Windows / make configurable on Windows This adds configurable options for Windows make files (both MinGW and MSVC). CI will also now exercise both traditional full API and stable ABI for Linux and Windows in the matrix for coverage. Also added a "dynamic" option to Linux matrix as a drive-by change to make other scripting languages like Ruby / Perl testable under both static and dynamic builds. 8) Fix inaccuracy in Windows docs Python's own docs are confusing but you don't actually want to use `python3.dll` for the dynamic linkage. 9) Add generated autoconf file 10) Add v:python3_version support This variable indicates the version of Python3 that Vim was built against (PY_VERSION_HEX), and will be useful to check whether the Python library you are loading in dynamically actually fits it. When built with stable ABI, it will be the limited ABI version instead (`Py_LIMITED_API`), which indicates the minimum version of Python 3 the user should have, rather than the exact match. When stable ABI is used, we won't be exposing PY_VERSION_HEX in this var because it just doesn't seem necessary to do so (the whole point of stable ABI is the promise that it will work across versions), and I don't want to confuse the user with too many variables. Also, cleaned up some documentation, and added help tags. 11) Fix Python 3.7 compat issues Fix a couple issues when using limited API < 3.8 - Crash on exit: In Python 3.7, if a heap-allocated type is destroyed before all instances are, it would cause a crash later. This happens when we destroyed `OptionsType` before calling `Py_Finalize` when using the limited API. To make it worse, later versions changed the semantics and now each instance has a strong reference to its own type and the recommendation has changed to have each instance de-ref its own type and have its type in GC traversal. To avoid dealing with these cross-version variations, we just don't free the heap type. They are static types in non-limited-API anyway and are designed to last through the entirety of the app, and we also don't restart the Python runtime and therefore do not need it to have absolutely 0 leaks. See: - https://docs.python.org/3/whatsnew/3.8.html#changes-in-the-c-api - https://docs.python.org/3/whatsnew/3.9.html#changes-in-the-c-api - PyIter_Check: This function is not provided in limited APIs older than 3.8. Previously I was trying to mock it out using manual PyType_GetSlot() but it was brittle and also does not actually work properly for static types (it will generate a Python error). Just return false. It does mean using limited API < 3.8 is not recommended as you lose the functionality to handle iterators, but from playing with plugins I couldn't find it to be an issue. - Fix loading of PyIter_Check so it will be done when limited API < 3.8. Otherwise loading a 3.7 Python lib will fail even if limited API was specified to use it. 12) Make sure to only load `PyUnicode_AsUTF8AndSize` in needed in limited API We don't use this function unless limited API >= 3.10, but we were loading it regardless. Usually it's ok in Unix-like systems where Python just has a single lib that we load from, but in Windows where there is a separate python3.dll this would not work as the symbol would not have been exposed in this more limited DLL file. This makes it much clearer under what condition is this function needed. closes: #12032 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
author Christian Brabandt <cb@256bit.org>
date Sun, 20 Aug 2023 21:30:04 +0200
parents 6dd88e45d47d
children d6dde6229b36
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 " Description: Comshare Dimension Definition Language (CDL)
25880
9c221ad9634a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 25773
diff changeset
2 " Maintainer: Raul Segura Acevedo <raulseguraaceved@netscape.net> (Invalid email address)
9c221ad9634a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 25773
diff changeset
3 " Doug Kearns <dougkearns@gmail.com>
28379
6dd88e45d47d Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 25880
diff changeset
4 " Last Change: 2022 Apr 06
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 if exists("b:did_indent")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 "finish
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 let b:did_indent = 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 setlocal indentexpr=CdlGetIndent(v:lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 setlocal indentkeys&
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 setlocal indentkeys+==~else,=~endif,=~then,;,),=
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14
28379
6dd88e45d47d Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 25880
diff changeset
15 let b:undo_indent = "setl inde< indk<"
6dd88e45d47d Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 25880
diff changeset
16
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 " Only define the function once.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 if exists("*CdlGetIndent")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 "finish
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21
25773
11b656e74444 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 24278
diff changeset
22 " find out if an "...=..." expression is an assignment (or a conditional)
11b656e74444 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 24278
diff changeset
23 " it scans 'line' first, and then the previous lines
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
24 fun! CdlAsignment(lnum, line)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
25 let f = -1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 let lnum = a:lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 let line = a:line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 while lnum > 0 && f == -1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29 " line without members [a] of [b]:[c]...
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 let inicio = 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 while 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32 " keywords that help to decide
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
33 let inicio = matchend(line, '\c\<\(expr\|\a*if\|and\|or\|not\|else\|then\|memberis\|\k\+of\)\>\|[<>;]', inicio)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34 if inicio < 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 break
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37 " it's formula if there's a ';', 'elsE', 'theN', 'enDif' or 'expr'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 " conditional if there's a '<', '>', 'elseif', 'if', 'and', 'or', 'not',
25773
11b656e74444 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 24278
diff changeset
39 " 'memberis', 'childrenof' and other \k\+of functions
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
40 let f = line[inicio-1] =~? '[en;]' || strpart(line, inicio-4, 4) =~? 'ndif\|expr'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
41 endw
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42 let lnum = prevnonblank(lnum-1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 let line = substitute(getline(lnum), '\c\(\[[^]]*]\(\s*of\s*\|:\)*\)\+', ' ', 'g')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44 endw
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45 " if we hit the start of the file then f = -1, return 1 (formula)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
46 return f != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
47 endf
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
49 fun! CdlGetIndent(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
50 let thisline = getline(a:lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
51 if match(thisline, '^\s*\(\k\+\|\[[^]]*]\)\s*\(,\|;\s*$\)') >= 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
52 " it's an attributes line
11518
63b0b7b79b25 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 10228
diff changeset
53 return shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
54 elseif match(thisline, '^\c\s*\([{}]\|\/[*/]\|dimension\|schedule\|group\|hierarchy\|class\)') >= 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
55 " it's a header or '{' or '}' or a comment
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
56 return 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
57 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
58
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
59 let lnum = prevnonblank(a:lnum-1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
60 " Hit the start of the file, use zero indent.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
61 if lnum == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
62 return 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
63 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
64
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
65 " PREVIOUS LINE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
66 let ind = indent(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
67 let line = getline(lnum)
24278
4ab4ef0c48b1 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
68
4ab4ef0c48b1 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
69 " Whether a '=' is a conditional or an assignment. -1 means we don't know
4ab4ef0c48b1 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
70 " yet.
4ab4ef0c48b1 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
71 " One 'closing' element at the beginning of the line has already reduced the
4ab4ef0c48b1 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
72 " indent, but 'else', 'elseif' & 'then' increment it for the next line.
4ab4ef0c48b1 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
73 " '=' at the beginning already has the right indent (increased for
4ab4ef0c48b1 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
74 " asignments).
4ab4ef0c48b1 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
75 let f = -1
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
76 let inicio = matchend(line, '^\c\s*\(else\a*\|then\|endif\|/[*/]\|[);={]\)')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
77 if inicio > 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
78 let c = line[inicio-1]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
79 " ')' and '=' don't change indent and are useless to set 'f'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
80 if c == '{'
11518
63b0b7b79b25 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 10228
diff changeset
81 return shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
82 elseif c != ')' && c != '='
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
83 let f = 1 " all but 'elseif' are followed by a formula
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
84 if c ==? 'n' || c ==? 'e' " 'then', 'else'
11518
63b0b7b79b25 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 10228
diff changeset
85 let ind = ind + shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
86 elseif strpart(line, inicio-6, 6) ==? 'elseif' " elseif, set f to conditional
11518
63b0b7b79b25 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 10228
diff changeset
87 let ind = ind + shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
88 let f = 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
89 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
90 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
91 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
92
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
93 " remove members [a] of [b]:[c]... (inicio remainds valid)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
94 let line = substitute(line, '\c\(\[[^]]*]\(\s*of\s*\|:\)*\)\+', ' ', 'g')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
95 while 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
96 " search for the next interesting element
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
97 let inicio=matchend(line, '\c\<if\|endif\|[()=;]', inicio)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
98 if inicio < 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
99 break
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
100 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
101
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
102 let c = line[inicio-1]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
103 " 'expr(...)' containing the formula
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
104 if strpart(line, inicio-5, 5) ==? 'expr('
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
105 let ind = 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
106 let f = 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
107 elseif c == ')' || c== ';' || strpart(line, inicio-5, 5) ==? 'endif'
11518
63b0b7b79b25 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 10228
diff changeset
108 let ind = ind - shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
109 elseif c == '(' || c ==? 'f' " '(' or 'if'
11518
63b0b7b79b25 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 10228
diff changeset
110 let ind = ind + shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
111 else " c == '='
25773
11b656e74444 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 24278
diff changeset
112 " if it is an assignment increase indent
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
113 if f == -1 " we don't know yet, find out
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
114 let f = CdlAsignment(lnum, strpart(line, 0, inicio))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
115 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
116 if f == 1 " formula increase it
11518
63b0b7b79b25 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 10228
diff changeset
117 let ind = ind + shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
118 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
119 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
120 endw
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
121
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
122 " CURRENT LINE, if it starts with a closing element, decrease indent
25773
11b656e74444 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 24278
diff changeset
123 " or if it starts with '=' (assignment), increase indent
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
124 if match(thisline, '^\c\s*\(else\|then\|endif\|[);]\)') >= 0
11518
63b0b7b79b25 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 10228
diff changeset
125 let ind = ind - shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
126 elseif match(thisline, '^\s*=') >= 0
25773
11b656e74444 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 24278
diff changeset
127 if f == -1 " we don't know yet if is an assignment, find out
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
128 let f = CdlAsignment(lnum, "")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
129 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
130 if f == 1 " formula increase it
11518
63b0b7b79b25 Update runtime files.
Christian Brabandt <cb@256bit.org>
parents: 10228
diff changeset
131 let ind = ind + shiftwidth()
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
132 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
133 end
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
134
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
135 return ind
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
136 endfun