Skip to content

Commit 44b65cd

Browse files
Anderson, ChaseAnderson, Chase
Anderson, Chase
authored and
Anderson, Chase
committed
added preliminary autocomplete improvements coupled with improvements to completions definitions
1 parent a4aa55e commit 44b65cd

7 files changed

+317
-155
lines changed

Main.sublime-menu

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
{
1212
"id": "linterinstall",
1313
"command": "linter_install",
14-
"caption": "Install SummitLinter Packages"}
14+
"caption": "Install SummitLinter Packages"
15+
},
1516
]
1617
}
1718
]

Summit.JSON-tmLanguage

+18-18
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
"include": "source.lua"
99
},
1010
{
11-
"include": "#summit-util-time"
11+
"include": "#summit-time"
1212
},
1313
{
14-
"include": "#summit-util-http"
14+
"include": "#summit-http"
1515
},
1616
{
17-
"include": "#summit-util-soap"
17+
"include": "#summit-soap"
1818
},
1919
{
20-
"include": "#summit-util-sms"
20+
"include": "#summit-sms"
2121
},
2222
{
23-
"include": "#summit-util-prefs"
23+
"include": "#summit-prefs"
2424
},
2525
{
2626
"include": "#summit-channel"
@@ -32,37 +32,37 @@
3232
],
3333
"scopeName": "source.lua.summit",
3434
"repository": {
35-
"summit-util-time": {
36-
"name": "support.function.library.lua.summit.util",
37-
"match": "(?<![^.]\\.|:)\\b(util\\.(time\\.(time_of_day|is_workday|is_business_hours|format|weekday_name|create|MONDAY|TUESDAY|WEDNESDAY|THURSDAY|FRIDAY|SATURDAY|SUNDAY|TIME_FORMAT|DATE_FORMAT|DEFAULT_INPUT_FORMAT)))\\b(?=[( {])",
35+
"summit-time": {
36+
"name": "support.function.library.lua.summit.time",
37+
"match": "(?<![^.]\\.|:)\\b(time\\.(now|is_workday|is_business_hours|format|weekday_name|create|to_unix_ts|MONDAY|TUESDAY|WEDNESDAY|THURSDAY|FRIDAY|SATURDAY|SUNDAY|TIME_FORMAT|DATE_FORMAT|DEFAULT_INPUT_FORMAT))\\b(?=[( {])",
3838
"captures": {
3939
"1": { "name": "constant.character.escape" }
4040
}
4141
},
42-
"summit-util-http": {
43-
"name": "support.function.library.lua.summit.util",
44-
"match": "(?<![^.]\\.|:)\\b(util\\.(http\\.(get|post)))\\b(?=[( {])",
42+
"summit-http": {
43+
"name": "support.function.library.lua.summit",
44+
"match": "(?<![^.]\\.|:)\\b(http\\.(get|post))\\b(?=[( {])",
4545
"captures": {
4646
"1": { "name": "constant.character.escape" }
4747
}
4848
},
49-
"summit-util-soap": {
50-
"name": "support.function.library.lua.summit.util",
51-
"match": "(?<![^.]\\.|:)\\b(util\\.(soap\\.(soapCall)))\\b(?=[( {])",
49+
"summit-soap": {
50+
"name": "support.function.library.lua.summit",
51+
"match": "(?<![^.]\\.|:)\\b(soap\\.(soapCall))\\b(?=[( {])",
5252
"captures": {
5353
"1": { "name": "constant.character.escape" }
5454
}
5555
},
56-
"summit-util-sms": {
56+
"summit-sms": {
5757
"name": "support.function.library.lua.summit.util",
58-
"match": "(?<![^.]\\.|:)\\b(util\\.(sms\\.(send)))\\b(?=[( {])",
58+
"match": "(?<![^.]\\.|:)\\b(sms\\.(send))\\b(?=[( {])",
5959
"captures": {
6060
"1": { "name": "constant.character.escape" }
6161
}
6262
},
63-
"summit-util-prefs": {
63+
"summit-prefs": {
6464
"name": "support.function.library.lua.summit.util",
65-
"match": "(?<![^.]\\.|:)\\b(util\\.(prefs\\.+))\\b",
65+
"match": "(?<![^.]\\.|:)\\b(prefs\\.+)\\b",
6666
"captures": {
6767
"1": { "name": "constant.character.escape" }
6868
}

Summit.tmLanguage

+18-18
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@
1616
</dict>
1717
<dict>
1818
<key>include</key>
19-
<string>#summit-util-time</string>
19+
<string>#summit-time</string>
2020
</dict>
2121
<dict>
2222
<key>include</key>
23-
<string>#summit-util-http</string>
23+
<string>#summit-http</string>
2424
</dict>
2525
<dict>
2626
<key>include</key>
27-
<string>#summit-util-soap</string>
27+
<string>#summit-soap</string>
2828
</dict>
2929
<dict>
3030
<key>include</key>
31-
<string>#summit-util-sms</string>
31+
<string>#summit-sms</string>
3232
</dict>
3333
<dict>
3434
<key>include</key>
35-
<string>#summit-util-prefs</string>
35+
<string>#summit-prefs</string>
3636
</dict>
3737
<dict>
3838
<key>include</key>
@@ -75,7 +75,7 @@
7575
<key>name</key>
7676
<string>support.function.library.lua.summit.channel.data</string>
7777
</dict>
78-
<key>summit-util-http</key>
78+
<key>summit-http</key>
7979
<dict>
8080
<key>captures</key>
8181
<dict>
@@ -86,11 +86,11 @@
8686
</dict>
8787
</dict>
8888
<key>match</key>
89-
<string>(?&lt;![^.]\.|:)\b(util\.(http\.(get|post)))\b(?=[( {])</string>
89+
<string>(?&lt;![^.]\.|:)\b(http\.(get|post))\b(?=[( {])</string>
9090
<key>name</key>
91-
<string>support.function.library.lua.summit.util</string>
91+
<string>support.function.library.lua.summit</string>
9292
</dict>
93-
<key>summit-util-prefs</key>
93+
<key>summit-prefs</key>
9494
<dict>
9595
<key>captures</key>
9696
<dict>
@@ -101,11 +101,11 @@
101101
</dict>
102102
</dict>
103103
<key>match</key>
104-
<string>(?&lt;![^.]\.|:)\b(util\.(prefs\.+))\b</string>
104+
<string>(?&lt;![^.]\.|:)\b(prefs\.+)\b</string>
105105
<key>name</key>
106106
<string>support.function.library.lua.summit.util</string>
107107
</dict>
108-
<key>summit-util-sms</key>
108+
<key>summit-sms</key>
109109
<dict>
110110
<key>captures</key>
111111
<dict>
@@ -116,11 +116,11 @@
116116
</dict>
117117
</dict>
118118
<key>match</key>
119-
<string>(?&lt;![^.]\.|:)\b(util\.(sms\.(send)))\b(?=[( {])</string>
119+
<string>(?&lt;![^.]\.|:)\b(sms\.(send))\b(?=[( {])</string>
120120
<key>name</key>
121121
<string>support.function.library.lua.summit.util</string>
122122
</dict>
123-
<key>summit-util-soap</key>
123+
<key>summit-soap</key>
124124
<dict>
125125
<key>captures</key>
126126
<dict>
@@ -131,11 +131,11 @@
131131
</dict>
132132
</dict>
133133
<key>match</key>
134-
<string>(?&lt;![^.]\.|:)\b(util\.(soap\.(soapCall)))\b(?=[( {])</string>
134+
<string>(?&lt;![^.]\.|:)\b(soap\.(soapCall))\b(?=[( {])</string>
135135
<key>name</key>
136-
<string>support.function.library.lua.summit.util</string>
136+
<string>support.function.library.lua.summit</string>
137137
</dict>
138-
<key>summit-util-time</key>
138+
<key>summit-time</key>
139139
<dict>
140140
<key>captures</key>
141141
<dict>
@@ -146,9 +146,9 @@
146146
</dict>
147147
</dict>
148148
<key>match</key>
149-
<string>(?&lt;![^.]\.|:)\b(util\.(time\.(time_of_day|is_workday|is_business_hours|format|weekday_name|create|MONDAY|TUESDAY|WEDNESDAY|THURSDAY|FRIDAY|SATURDAY|SUNDAY|TIME_FORMAT|DATE_FORMAT|DEFAULT_INPUT_FORMAT)))\b(?=[( {])</string>
149+
<string>(?&lt;![^.]\.|:)\b(time\.(now|is_workday|is_business_hours|format|weekday_name|create|to_unix_ts|MONDAY|TUESDAY|WEDNESDAY|THURSDAY|FRIDAY|SATURDAY|SUNDAY|TIME_FORMAT|DATE_FORMAT|DEFAULT_INPUT_FORMAT))\b(?=[( {])</string>
150150
<key>name</key>
151-
<string>support.function.library.lua.summit.util</string>
151+
<string>support.function.library.lua.summit.time</string>
152152
</dict>
153153
</dict>
154154
<key>scopeName</key>

SummitEditor.sublime-settings

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,11 @@
88
"summit_simulate_on_save": false,
99

1010
// If set to true, automatically lint (error-check) code on save
11-
"summit_lint_on_save": true
11+
"summit_lint_on_save": true,
12+
13+
// If set to true, use SummitEditor's autocompletion
14+
"use_summit_editor_completion": true,
15+
16+
// The file where SummitEditor's completions are stored
17+
"completions_file": "summit.completions",
1218
}

SummitLua.sublime-completions

-117
This file was deleted.

0 commit comments

Comments
 (0)