Skip to content

Commit 7c60775

Browse files
stephenfinstephenfin
committed
Merge branch 'development'
2 parents 79e60a7 + 081fe3b commit 7c60775

24 files changed

+1130
-606
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
*.pyc
2+
*.pyc

‎.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
# http://lint.travis-ci.org/
33
language: python
44
python:
5-
- "2.6" # sublime text 2
6-
- "3.3" # sublime text 3
5+
- "2.6" # sublime text 2
6+
- "3.3" # sublime text 3
77
before_install:
8-
- sudo apt-get install exuberant-ctags
9-
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
8+
- sudo apt-get install exuberant-ctags
9+
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
1010
script:
11-
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then python -m unittest2.__main__ discover; fi
12-
- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then python -m unittest discover; fi
11+
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then python -m unittest2.__main__ discover; fi
12+
- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then python -m unittest discover; fi

‎CTAGS_README.rst

-77
This file was deleted.

‎CTags.sublime-settings

+132-21
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,167 @@
11
// Place your settings in the file "User/CTags.sublime-settings", which
22
// overrides the settings in here.
33
{
4-
// Enable debugging
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.
58
"debug": false,
69

7-
// Enable autocomplete
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.
815
"autocomplete": false,
916

17+
// Path to ctags executable.
18+
//
1019
// Alter this value if your ctags command is not in the PATH, or if using
1120
// a different version of ctags to that in the path (i.e. for OSX).
1221
//
1322
// NOTE: You *should not* place entire commands here. These commands are
14-
// built automatically using the values below. For example:
15-
// GOOD: "command": "/usr/bin/ctags"
16-
// BAD: "command": "ctags -R -f .tags --exclude=some/path"
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+
//
1731
"command": "",
1832

19-
// Set to false to disable recursive search for ctag generation. This
20-
// translates the `-R` parameter
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.
2137
"recursive" : true,
2238

23-
// Default read/write location of the tags file. This translates to the
24-
// `-f [FILENAME]` parameter
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.
2545
"tag_file" : ".tags",
2646

27-
// Additional options to pass to ctags, i.e.
28-
// ["--exclude=some/path", "--exclude=some/other/path", ...]
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"],
51+
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", ...]
2958
"opts" : [],
3059

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$"
3171
//
3272
"filters": {
3373
"source.python": {"type":"^i$"}
3474
},
3575

76+
// Definition "kind"s to ignore.
3677
//
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.
3782
"definition_filters": {
3883
"source.php": {"type":"^v$"}
3984
},
4085

86+
// Enable the ctags menu in the context menus.
87+
"show_context_menus": true,
88+
89+
// Paths to additional tag files to include in tag search.
4190
//
42-
"definition_current_first": true,
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+
],
4398

44-
// Show the ctags menu in the context menus
45-
"show_context_menus": 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,
46105

47-
// Paths to additional tag files to include in tag search. This is a list
48-
// of items in the form [["language", "platform"], "path"]
49-
"extra_tag_paths": [[["source.python", "windows"], "C:\\Python27\\Lib\\tags"]],
106+
// Set to false to not open an error dialog while tags are building
107+
"display_rebuilding_message": true,
50108

51-
// Additional tag files to search
52-
"extra_tag_files": [".gemtags", "tags"],
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+
},
53154

54-
// Set to false so as not to select searched symbol (in Vintage mode)
55-
"select_searched_symbol": true
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.*?)"
56167
}

‎Context.sublime-menu

+13-13
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+
"command": "navigate_to_definition",
7+
"args": {},
8+
"caption": "Navigate to Definition"
9+
},
10+
{
11+
"command": "jump_prev",
12+
"args": {},
13+
"caption": "Jump Back"
14+
}
1515
]

‎Default.sublime-commands

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
[
2-
{
3-
"caption": "CTags: Rebuild Tags",
4-
"command": "rebuild_tags"
5-
},
6-
{
7-
"caption": "CTags: Show Symbols (file)",
8-
"command": "show_symbols",
9-
"context": [
10-
{
11-
"key": "selector",
12-
"match_all": true,
13-
"operand": "source -source.css",
14-
"operator": "equal"
15-
}
16-
]
17-
},
18-
{
19-
"caption": "CTags: Show Symbols (all)",
20-
"command": "show_symbols",
21-
"args": {
22-
"type": "multi"
2+
{
3+
"caption": "CTags: Rebuild Tags",
4+
"command": "rebuild_tags"
235
},
24-
"context": [
25-
{
26-
"key": "selector",
27-
"match_all": true,
28-
"operand": "source -source.css",
29-
"operator": "equal"
30-
}
31-
]
32-
}
6+
{
7+
"caption": "CTags: Show Symbols (file)",
8+
"command": "show_symbols",
9+
"context": [
10+
{
11+
"key": "selector",
12+
"match_all": true,
13+
"operand": "source -source.css",
14+
"operator": "equal"
15+
}
16+
]
17+
},
18+
{
19+
"caption": "CTags: Show Symbols (all)",
20+
"command": "show_symbols",
21+
"args": {
22+
"type": "multi"
23+
},
24+
"context": [
25+
{
26+
"key": "selector",
27+
"match_all": true,
28+
"operand": "source -source.css",
29+
"operator": "equal"
30+
}
31+
]
32+
}
3333
]

0 commit comments

Comments
 (0)