Skip to content

Commit 9d52b7d

Browse files
deathaxedeathaxe
committed
Merge branch 'development'
2 parents ae48221 + 2b6041f commit 9d52b7d

32 files changed

+1483
-1381
lines changed

‎.gitattributes‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# git
2+
.github/ export-ignore
3+
.gitattributes export-ignore
4+
.gitignore export-ignore
5+
6+
# unittests
7+
plugins/tests/ export-ignore

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
- name: Install PyTest
1717
run: pip install pytest
1818
- name: Run PyTest
19-
run: pytest .
19+
run: pytest plugins
2020

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
1+
# python cache files
2+
.mypy_cache/
3+
.pytest_cache/
4+
.venv/
5+
__pycache__/
26
*.pyc

‎CTags.sublime-settings‎

Lines changed: 149 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,167 +1,167 @@
11
// Place your settings in the file "User/CTags.sublime-settings", which
22
// overrides the settings in here.
33
{
4-
// Enable debugging.
5-
//
6-
// When enabled, this will result in debug output being printed to the
7-
// console. This can be useful for debugging issues.
8-
"debug": false,
4+
// Enable debugging.
5+
//
6+
// When enabled, this will result in debug output being printed to the
7+
// console. This can be useful for debugging issues.
8+
"debug": false,
99

10-
// Enable auto-complete.
11-
//
12-
// When enabled, this turns on a basic "auto-complete" feature, similar to
13-
// a very rudimentary "Intellisense(TM)". This is useful for providing
14-
// better suggestions than stock Sublime Text could provide.
15-
"autocomplete": false,
10+
// Enable auto-complete.
11+
//
12+
// When enabled, this turns on a basic "auto-complete" feature, similar to
13+
// a very rudimentary "Intellisense(TM)". This is useful for providing
14+
// better suggestions than stock Sublime Text could provide.
15+
"autocomplete": false,
1616

17-
// Path to ctags executable.
18-
//
19-
// Alter this value if your ctags command is not in the PATH, or if using
20-
// a different version of ctags to that in the path (i.e. for OSX).
21-
//
22-
// NOTE: You *should not* place entire commands here. These commands are
23-
// built automatically using the values below. For example, this is OK:
24-
//
25-
// "command": "/usr/bin/ctags"
26-
//
27-
// This, on the other hand, won't work!
28-
//
29-
// "command": "ctags -R -f .tags --exclude=some/path"
30-
//
31-
"command": "",
17+
// Path to ctags executable.
18+
//
19+
// Alter this value if your ctags command is not in the PATH, or if using
20+
// a different version of ctags to that in the path (i.e. for OSX).
21+
//
22+
// NOTE: You *should not* place entire commands here. These commands are
23+
// built automatically using the values below. For example, this is OK:
24+
//
25+
// "command": "/usr/bin/ctags"
26+
//
27+
// This, on the other hand, won't work!
28+
//
29+
// "command": "ctags -R -f .tags --exclude=some/path"
30+
//
31+
"command": "",
3232

33-
// Enable recursive searching of directories when building tag files.
34-
//
35-
// When enabled, this is equivalent to `-R` parameter. Set to true to
36-
// enable recursive search of directories when generating tag files.
37-
"recursive" : true,
33+
// Enable recursive searching of directories when building tag files.
34+
//
35+
// When enabled, this is equivalent to `-R` parameter. Set to true to
36+
// enable recursive search of directories when generating tag files.
37+
"recursive" : true,
3838

39-
// Default read/write location of the tags file.
40-
//
41-
// This is equivalent to the `-f [FILENAME]` parameter. There is likely no
42-
// reason to change this unless you have a large number of existing tags
43-
// files you'd like to use that already have a different name. In this
44-
// case perhaps consider using the 'extra_tag_files' setting instead.
45-
"tag_file" : ".tags",
39+
// Default read/write location of the tags file.
40+
//
41+
// This is equivalent to the `-f [FILENAME]` parameter. There is likely no
42+
// reason to change this unless you have a large number of existing tags
43+
// files you'd like to use that already have a different name. In this
44+
// case perhaps consider using the 'extra_tag_files' setting instead.
45+
"tag_file" : ".tags",
4646

47-
// Additional tag files names to search.
48-
//
49-
// These are searched in addition to the file name given in 'tag_file'
50-
"extra_tag_files": [".gemtags", "tags"],
47+
// Additional tag files names to search.
48+
//
49+
// These are searched in addition to the file name given in 'tag_file'
50+
"extra_tag_files": [".gemtags", "tags"],
5151

52-
// Additional options to pass to ctags.
53-
//
54-
// Any addition options you may wish to pass to the ctags executable. For
55-
// example:
56-
//
57-
// ["--exclude=some/path", "--exclude=some/other/path", ...]
58-
"opts" : [],
52+
// Additional options to pass to ctags.
53+
//
54+
// Any addition options you may wish to pass to the ctags executable. For
55+
// example:
56+
//
57+
// ["--exclude=some/path", "--exclude=some/other/path", ...]
58+
"opts" : [],
5959

60-
// Tag "kind"s to ignore.
61-
//
62-
// A ctags tagfile describes a number of different "kind"s, described in
63-
// tag FORMAT file found here:
64-
//
65-
// http://ctags.sourceforge.net/FORMAT
66-
//
67-
// These can be filtered (i.e. ignored). For example - 'import' statements
68-
// should be ignored in Python. These are of kind "i", e.g.
69-
//
70-
// "type":"^i$"
71-
//
72-
"filters": {
73-
"source.python": {"type":"^i$"}
74-
},
60+
// Tag "kind"s to ignore.
61+
//
62+
// A ctags tagfile describes a number of different "kind"s, described in
63+
// tag FORMAT file found here:
64+
//
65+
// http://ctags.sourceforge.net/FORMAT
66+
//
67+
// These can be filtered (i.e. ignored). For example - 'import' statements
68+
// should be ignored in Python. These are of kind "i", e.g.
69+
//
70+
// "type":"^i$"
71+
//
72+
"filters": {
73+
"source.python": {"type":"^i$"}
74+
},
7575

76-
// Definition "kind"s to ignore.
77-
//
78-
// This is very similar to the 'filters' option. However, this only
79-
// applies to the process that is used to find a definition. All filters
80-
// placed here will be used when the plugin is searching for a definition
81-
// in the file.
82-
"definition_filters": {
83-
"source.php": {"type":"^v$"}
84-
},
76+
// Definition "kind"s to ignore.
77+
//
78+
// This is very similar to the 'filters' option. However, this only
79+
// applies to the process that is used to find a definition. All filters
80+
// placed here will be used when the plugin is searching for a definition
81+
// in the file.
82+
"definition_filters": {
83+
"source.php": {"type":"^v$"}
84+
},
8585

86-
// Enable the ctags menu in the context menus.
87-
"show_context_menus": true,
86+
// Enable the ctags menu in the context menus.
87+
"show_context_menus": true,
8888

89-
// Paths to additional tag files to include in tag search.
90-
//
91-
// This is a list of items in the following format:
92-
//
93-
// [["language", "platform"], "path"]
94-
//
95-
"extra_tag_paths": [
96-
[["source.python", "windows"], "C:\\Python27\\Lib\\tags"]
97-
],
89+
// Paths to additional tag files to include in tag search.
90+
//
91+
// This is a list of items in the following format:
92+
//
93+
// [["language", "platform"], "path"]
94+
//
95+
"extra_tag_paths": [
96+
[["source.python", "windows"], "C:\\Python27\\Lib\\tags"]
97+
],
9898

99-
// Enable highlighting of selected symbol.
100-
//
101-
// When enabled, searched symbols will be highlighted when found. This
102-
// can be irritating in some instances, e.g. when in Vintage mode. In
103-
// these cases, setting this to false will disable this highlighting.
104-
"select_searched_symbol": true,
99+
// Enable highlighting of selected symbol.
100+
//
101+
// When enabled, searched symbols will be highlighted when found. This
102+
// can be irritating in some instances, e.g. when in Vintage mode. In
103+
// these cases, setting this to false will disable this highlighting.
104+
"select_searched_symbol": true,
105105

106-
// Set to false to not open an error dialog while tags are building
107-
"display_rebuilding_message": true,
106+
// Set to false to not open an error dialog while tags are building
107+
"display_rebuilding_message": true,
108108

109-
// Rank Manager language syntax regex and character sets
110-
//
111-
// Ex: Python 'and' ignore exp --> '\sand\s' - it must have whitespace
112-
// around it so it is not part of real name: gates.Nand.evaluate()
113-
"language_syntax": {
114-
"splitters" : [".", "::", "->"],
115-
"source.js": {
116-
"member_exp": {
117-
"chars": "[A-Za-z0-9_$]",
118-
"splitters": ["\\."],
119-
"open": ["\\{", "\\[", "\\("],
120-
"close": ["\\}", "\\]" , "\\)"], //close[i] must match open[i]
121-
"ignore": ["&", "\\|", "\\?", ":", "\\!", "'", "=", "\""],
122-
"stop": ["\\s", ","],
123-
"this": ["this", "me", "self", "that"]
124-
},
125-
"reference_types": {
126-
"__symbol__(\\.call|\\.apply){0,1}\\s*?\\(": ["f", "fa"],
127-
"\\.fire\\s*?\\(\\s*?\\[\\'\"]__symbol__\\[\\'\"\\]": [
128-
"eventHandler"
129-
]
130-
}
131-
},
132-
"source.python": {
133-
//python settings inherit JavaScript, with some overrides
134-
"inherit": "source.js",
135-
"member_exp": {
136-
"ignore": ["\\sand\\s", "\\sor\\s", "\\snot\\s", ":", "\\!",
137-
"'", "=", "\""],
138-
"this" : ["self"]
139-
}
140-
},
141-
"source.java": {
142-
"inherit": "source.js",
143-
"member_exp": {
144-
"this" : ["this"]
145-
}
146-
},
147-
"source.cs": {
148-
"inherit": "source.js",
149-
"member_exp": {
150-
"this" : ["this"]
151-
}
152-
}
153-
},
109+
// Rank Manager language syntax regex and character sets
110+
//
111+
// Ex: Python 'and' ignore exp --> '\sand\s' - it must have whitespace
112+
// around it so it is not part of real name: gates.Nand.evaluate()
113+
"language_syntax": {
114+
"splitters" : [".", "::", "->"],
115+
"source.js": {
116+
"member_exp": {
117+
"chars": "[A-Za-z0-9_$]",
118+
"splitters": ["\\."],
119+
"open": ["\\{", "\\[", "\\("],
120+
"close": ["\\}", "\\]" , "\\)"], //close[i] must match open[i]
121+
"ignore": ["&", "\\|", "\\?", ":", "\\!", "'", "=", "\""],
122+
"stop": ["\\s", ","],
123+
"this": ["this", "me", "self", "that"]
124+
},
125+
"reference_types": {
126+
"__symbol__(\\.call|\\.apply){0,1}\\s*?\\(": ["f", "fa"],
127+
"\\.fire\\s*?\\(\\s*?\\[\\'\"]__symbol__\\[\\'\"\\]": [
128+
"eventHandler"
129+
]
130+
}
131+
},
132+
"source.python": {
133+
//python settings inherit JavaScript, with some overrides
134+
"inherit": "source.js",
135+
"member_exp": {
136+
"ignore": ["\\sand\\s", "\\sor\\s", "\\snot\\s", ":", "\\!",
137+
"'", "=", "\""],
138+
"this" : ["self"]
139+
}
140+
},
141+
"source.java": {
142+
"inherit": "source.js",
143+
"member_exp": {
144+
"this" : ["this"]
145+
}
146+
},
147+
"source.cs": {
148+
"inherit": "source.js",
149+
"member_exp": {
150+
"this" : ["this"]
151+
}
152+
}
153+
},
154154

155-
// Scope Filters
156-
//
157-
// Tags file may optionally contain tagfield for the scope of the tag. For
158-
// example:
159-
//
160-
// item .\fileHelper.js 420;" vp lineno:420 scope:420:19-422:9
161-
//
162-
// The re is used to extract 'scope:/beginLine:beginCol-endLine:endCol/'
163-
//
164-
// Different tags generators may generate this non-standard field in
165-
// different formats
166-
"scope_re": "(\\d.*?):(\\d.*?)-(\\d.*?):(\\d.*?)"
155+
// Scope Filters
156+
//
157+
// Tags file may optionally contain tagfield for the scope of the tag. For
158+
// example:
159+
//
160+
// item .\fileHelper.js 420;" vp lineno:420 scope:420:19-422:9
161+
//
162+
// The re is used to extract 'scope:/beginLine:beginCol-endLine:endCol/'
163+
//
164+
// Different tags generators may generate this non-standard field in
165+
// different formats
166+
"scope_re": "(\\d.*?):(\\d.*?)-(\\d.*?):(\\d.*?)"
167167
}

‎Context.sublime-menu‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[
2-
{
3-
"caption": "-"
4-
},
5-
{
6-
"command": "navigate_to_definition",
7-
"args": {},
8-
"caption": "Navigate to Definition"
9-
},
10-
{
11-
"command": "jump_prev",
12-
"args": {},
13-
"caption": "Jump Back"
14-
}
2+
{
3+
"caption": "-"
4+
},
5+
{
6+
"caption": "Navigate to Definition",
7+
"command": "navigate_to_definition",
8+
"args": {}
9+
},
10+
{
11+
"caption": "Jump Back",
12+
"command": "jump_prev",
13+
"args": {}
14+
}
1515
]

0 commit comments

Comments
 (0)