Skip to content

Commit e423ce5

Browse files
author
deathaxe
committed
Merge branch 'master' into cibinmathew/master
2 parents d4e1fc5 + 82fec9e commit e423ce5

7 files changed

+306
-374
lines changed

‎.python-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.8

‎AdvancedNewFile.py

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
import sublime
22
import sys
33

4-
VERSION = int(sublime.version())
5-
6-
reloader = "advanced_new_file.reloader"
7-
8-
if VERSION > 3000:
9-
reloader = 'AdvancedNewFile.' + reloader
10-
from imp import reload
11-
4+
# Clear module cache to force reloading all modules of this package.
125

13-
# Make sure all dependencies are reloaded on upgrade
14-
if reloader in sys.modules:
15-
reload(sys.modules[reloader])
6+
# kiss-reloader:
7+
prefix = __package__ + "." # don't clear the base package
8+
for module_name in [
9+
module_name
10+
for module_name in sys.modules
11+
if module_name.startswith(prefix) and module_name != __name__
12+
]:
13+
del sys.modules[module_name]
14+
prefix = None
1615

16+
VERSION = int(sublime.version())
1717
if VERSION > 3000:
18-
from .advanced_new_file import reloader
1918
from .advanced_new_file.commands import *
2019
else:
21-
from advanced_new_file import reloader
2220
from advanced_new_file.commands import *

‎AdvancedNewFile.sublime-settings

+188-188
Large diffs are not rendered by default.

‎Default.sublime-commands

+41-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,43 @@
11
[
2-
{ "caption": "ANF: New File", "command": "advanced_new_file_new" },
3-
{ "caption": "ANF: Rename File", "command": "advanced_new_file_move"},
4-
{ "caption": "ANF: Delete File", "command": "advanced_new_file_delete"},
5-
{ "caption": "ANF: Delete Current File", "command": "advanced_new_file_delete", "args": {"current": true}},
6-
{ "caption": "ANF: Copy Current File", "command": "advanced_new_file_copy" },
7-
{ "caption": "ANF: Cut to File", "command": "advanced_new_file_cut_to_file" }
2+
{
3+
"caption": "ANF: New File",
4+
"command": "advanced_new_file_new"
5+
},
6+
{
7+
"caption": "ANF: Rename File",
8+
"command": "advanced_new_file_move"
9+
},
10+
{
11+
"caption": "ANF: Delete File",
12+
"command": "advanced_new_file_delete"
13+
},
14+
{
15+
"caption": "ANF: Delete Current File",
16+
"command": "advanced_new_file_delete",
17+
"args": {"current": true}
18+
},
19+
{
20+
"caption": "ANF: Copy Current File",
21+
"command": "advanced_new_file_copy"
22+
},
23+
{
24+
"caption": "ANF: Cut to File",
25+
"command": "advanced_new_file_cut_to_file"
26+
},
27+
{
28+
"caption": "Preferences: AdvancedNewFile Settings",
29+
"command": "edit_settings",
30+
"args": {
31+
"base_file": "${packages}/AdvancedNewFile/AdvancedNewFile.sublime-settings",
32+
"default": "// Settings in here override those in \"AdvancedNewFile/AdvancedNewFile.sublime-settings\".\n{\n\t$0\n}\n"
33+
}
34+
},
35+
{
36+
"caption": "Preferences: AdvancedNewFile Key Bindings",
37+
"command": "edit_settings",
38+
"args": {
39+
"base_file": "${packages}/AdvancedNewFile/Default ($platform).sublime-keymap",
40+
"default": "[\n\t$0\n]\n"
41+
}
42+
}
843
]

‎Main.sublime-menu

+44-88
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,46 @@
11
[
2-
{
3-
"caption": "Preferences",
4-
"mnemonic": "n",
5-
"id": "preferences",
6-
"children":
7-
[
8-
{
9-
"caption": "Package Settings",
10-
"mnemonic": "P",
11-
"id": "package-settings",
12-
"children":
13-
[
14-
{
15-
"caption": "AdvancedNewFile",
16-
"children":
17-
[
18-
{
19-
"command": "open_file",
20-
"args": {"file": "${packages}/AdvancedNewFile/README.md"},
21-
"caption": "README"
22-
},
23-
{ "caption": "-" },
24-
{
25-
"command": "open_file",
26-
"args": {"file": "${packages}/AdvancedNewFile/AdvancedNewFile.sublime-settings"},
27-
"caption": "Settings – Default"
28-
},
29-
{
30-
"command": "open_file",
31-
"args": {"file": "${packages}/User/AdvancedNewFile.sublime-settings"},
32-
"caption": "Settings – User"
33-
},
34-
{ "caption": "-" },
35-
{
36-
"command": "open_file",
37-
"args": {
38-
"file": "${packages}/AdvancedNewFile/Default (OSX).sublime-keymap",
39-
"platform": "OSX"
40-
},
41-
"caption": "Key Bindings – Default"
42-
},
43-
{
44-
"command": "open_file",
45-
"args": {
46-
"file": "${packages}/AdvancedNewFile/Default (Linux).sublime-keymap",
47-
"platform": "Linux"
48-
},
49-
"caption": "Key Bindings – Default"
50-
},
51-
{
52-
"command": "open_file",
53-
"args": {
54-
"file": "${packages}/AdvancedNewFile/Default (Windows).sublime-keymap",
55-
"platform": "Windows"
56-
},
57-
"caption": "Key Bindings – Default"
58-
},
59-
{
60-
"command": "open_file",
61-
"args": {
62-
"file": "${packages}/User/Default (OSX).sublime-keymap",
63-
"platform": "OSX"
64-
},
65-
"caption": "Key Bindings – User"
66-
},
67-
{
68-
"command": "open_file",
69-
"args": {
70-
"file": "${packages}/User/Default (Linux).sublime-keymap",
71-
"platform": "Linux"
72-
},
73-
"caption": "Key Bindings – User"
74-
},
75-
{
76-
"command": "open_file",
77-
"args": {
78-
"file": "${packages}/User/Default (Windows).sublime-keymap",
79-
"platform": "Windows"
80-
},
81-
"caption": "Key Bindings – User"
82-
},
83-
{ "caption": "-" }
84-
]
85-
}
86-
]
87-
}
88-
]
89-
}
2+
{
3+
"caption": "Preferences",
4+
"mnemonic": "n",
5+
"id": "preferences",
6+
"children":
7+
[
8+
{
9+
"caption": "Package Settings",
10+
"mnemonic": "P",
11+
"id": "package-settings",
12+
"children":
13+
[
14+
{
15+
"caption": "AdvancedNewFile",
16+
"children":
17+
[
18+
{
19+
"caption": "README",
20+
"command": "open_file",
21+
"args": {"file": "${packages}/AdvancedNewFile/README.md"}
22+
},
23+
{ "caption": "-" },
24+
{
25+
"caption": "Settings",
26+
"command": "edit_settings",
27+
"args": {
28+
"base_file": "${packages}/AdvancedNewFile/AdvancedNewFile.sublime-settings",
29+
"default": "// Settings in here override those in \"AdvancedNewFile/AdvancedNewFile.sublime-settings\".\n{\n\t$0\n}\n"
30+
}
31+
},
32+
{
33+
"caption": "Key Bindings",
34+
"command": "edit_settings",
35+
"args": {
36+
"base_file": "${packages}/AdvancedNewFile/Default ($platform).sublime-keymap",
37+
"default": "[\n\t$0\n]\n"
38+
}
39+
}
40+
]
41+
}
42+
]
43+
}
44+
]
45+
}
9046
]

‎advanced_new_file/reloader.py

-58
This file was deleted.

‎messages.json

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"install": "messages/install.txt",
3-
"2012.11.08.20.00.00": "messages/1.txt",
4-
"2012.11.12.11.00.00": "messages/2.txt",
5-
"2012.11.26.11.00.00": "messages/3.txt",
6-
"2012.12.17.11.00.00": "messages/4.txt",
7-
"2013.07.29.11.00.00": "messages/5.txt",
8-
"2013.08.05.11.00.00": "messages/6.txt",
9-
"2013.09.03.11.00.00": "messages/7.txt",
10-
"2013.11.05.11.00.00": "messages/8.txt",
11-
"1.0.0": "messages/8.txt",
12-
"1.1.0": "messages/1.1.0.txt",
13-
"1.1.1": "messages/1.1.1.txt",
14-
"1.2.0": "messages/1.2.0.txt",
15-
"1.2.1": "messages/1.2.1.txt",
16-
"1.3.0": "messages/1.3.0.txt",
17-
"1.4.0": "messages/1.4.0.txt",
18-
"1.4.3": "messages/1.4.3.txt",
19-
"1.5.0": "messages/1.5.0.txt",
20-
"1.5.1": "messages/1.5.1.txt",
21-
"1.6.0": "messages/1.6.0.txt",
22-
"1.7.0": "messages/1.7.0.txt"
2+
"install": "messages/install.txt",
3+
"2012.11.08.20.00.00": "messages/1.txt",
4+
"2012.11.12.11.00.00": "messages/2.txt",
5+
"2012.11.26.11.00.00": "messages/3.txt",
6+
"2012.12.17.11.00.00": "messages/4.txt",
7+
"2013.07.29.11.00.00": "messages/5.txt",
8+
"2013.08.05.11.00.00": "messages/6.txt",
9+
"2013.09.03.11.00.00": "messages/7.txt",
10+
"2013.11.05.11.00.00": "messages/8.txt",
11+
"1.0.0": "messages/8.txt",
12+
"1.1.0": "messages/1.1.0.txt",
13+
"1.1.1": "messages/1.1.1.txt",
14+
"1.2.0": "messages/1.2.0.txt",
15+
"1.2.1": "messages/1.2.1.txt",
16+
"1.3.0": "messages/1.3.0.txt",
17+
"1.4.0": "messages/1.4.0.txt",
18+
"1.4.3": "messages/1.4.3.txt",
19+
"1.5.0": "messages/1.5.0.txt",
20+
"1.5.1": "messages/1.5.1.txt",
21+
"1.6.0": "messages/1.6.0.txt",
22+
"1.7.0": "messages/1.7.0.txt"
2323
}

0 commit comments

Comments
 (0)