From f0ac48b8de596d2bd3a01b491635c77bb7684728 Mon Sep 17 00:00:00 2001 From: koroshiya Date: Wed, 30 Sep 2015 08:34:27 +1000 Subject: [PATCH] 1.1.4 --- RenpyLanguage.JSON-tmLanguage | 47 +++++++++++++++------ RenpyLanguage.tmLanguage | 77 +++++++++++++++++++++++++++++++---- TODO.txt | 11 ++++- messages.json | 3 +- messages/1.1.4.txt | 7 ++++ 5 files changed, 123 insertions(+), 22 deletions(-) create mode 100644 messages/1.1.4.txt diff --git a/RenpyLanguage.JSON-tmLanguage b/RenpyLanguage.JSON-tmLanguage index d3657bc..e5631d2 100644 --- a/RenpyLanguage.JSON-tmLanguage +++ b/RenpyLanguage.JSON-tmLanguage @@ -27,15 +27,19 @@ "0":{"name":"keyword.control.flow.renpy"} }, "patterns": [ - {"include": "#python"} + {"include": "#python"}, + {"include": "source.python"} ], "end": "^(?!(\\1\\s+|\\s*$))", "name": "source.python.renpy" }, { - "match":"^(\\s*)(\\$)(.*)", - "include": "#python", + "match":"^(\\s*)(\\$)$\n?", + "patterns": [ + {"include": "#python"}, + {"include": "source.python"} + ], "name": "source.python.renpy" }, @@ -45,7 +49,8 @@ "0":{"name":"keyword.control.flow.renpy"} }, "patterns": [ - {"include": "#init"} + {"include": "#init"}, + {"include": "source.python"} ], "end": "^(?!(\\1\\s+|\\s*$))", "name": "source.python.renpy.init" @@ -67,7 +72,8 @@ "4":{"name":"variable.renpy"} }, "patterns": [ - {"include": "#screen"} + {"include": "#screen"}, + {"include": "source.python"} ], "end": "^(?!(\\1\\s+|\\s*$))", "name": "source.renpy.screen" @@ -82,7 +88,8 @@ "9":{"name":"variable.renpy"} }, "patterns": [ - {"include": "#atl"} + {"include": "#atl"}, + {"include": "source.python"} ], "end": "^(?!(\\1\\s+|\\s*$))", "name": "source.renpy.atl" @@ -95,7 +102,8 @@ "4":{"name":"variable.renpy"} }, "patterns": [ - {"include": "#transform"} + {"include": "#transform"}, + {"include": "source.python"} ], "end": "^(?!(\\1\\s+|\\s*$))", "name": "source.renpy.transform" @@ -108,7 +116,8 @@ "4":{"name":"variable.renpy"} }, "patterns": [ - {"include": "#transform"} + {"include": "#transform"}, + {"include": "source.python"} ], "end": "^(?!(\\1\\s+|\\s*$))", "name": "source.renpy.transform" @@ -120,15 +129,19 @@ "0":{"name":"keyword.control.flow.renpy"} }, "patterns": [ - {"include": "#python"} + {"include": "#python"}, + {"include": "source.python"} ], "end": "^(?!(\\1\\s+|\\s*$))", "name": "source.python.renpy" }, { - "match":"^(\\s*)(\\$)(.*)", - "include": "#python", + "match":"^(\\s*)(\\$)$\n?", + "patterns": [ + {"include": "#python"}, + {"include": "source.python"} + ], "name": "source.python.renpy" }, @@ -138,14 +151,16 @@ "0":{"name":"keyword.control.flow.renpy"} }, "patterns": [ - {"include": "#init"} + {"include": "#init"}, + {"include": "source.python"} ], "end": "^(?!(\\1\\s+|\\s*$))", "name": "source.python.renpy.init" }, { - "include": "#default" + "include": "#default", + "include": "source.python" } ], @@ -188,6 +203,9 @@ { "match": "\\b(adjust_view_size|adv_nvl_transition|afm_bonus|afm_callback|afm_characters|after_load_transition|after_replay_callback|all_character_callbacks|allow_skipping|archives|auto_choice_delay|auto_load|auto_voice|automatic_images|automatic_images_strip|autoreload|autosave_frequency|autosave_on_choice|autosave_on_quit|autosave_slots|character_callback|choice_layer|clear_layers|context_clear_layers|custom_text_tags|debug|debug_image_cache|debug_sound|debug_text_overflow|default_afm_enable|default_afm_time|default_emphasize_audio|default_fullscreen|default_language|default_show_empty_window|default_text_cps|default_transform|default_voice_sustain|default_wait_for_voice|developer|dispatch_gesture|emphasize_audio_channels|emphasize_audio_time|emphasize_audio_volume|empty_window|end_game_transition|end_splash_transition|enter_replay_transition|enter_sound|enter_transition|enter_yesno_transition|exit_replay_transition|exit_sound|exit_transition|exit_yesno_transition|fade_music|fast_skipping|file_open_callback|fix_rollback_without_choice|focus_crossrange_penalty|font_replacement_map|framerate|game_main_transition|game_menu|game_menu_music|gestures|gl_enable|gl_resize|gl_test_image|hard_rollback_limit|has_autosave|help|hide|hw_video|image_cache_size|imagemap_auto_function|imagemap_cache|implicit_with_none|interact_callbacks|keep_running_transform|key_repeat|keymap|label_callback|label_overrides|language|layer_clipping|layers|lint_hooks|load_before_transition|log|longpress_duration|longpress_radius|longpress_vibrate|main_game_transition|main_menu|main_menu_music|menu_clear_layers|menu_window_subtitle|minimum_presplash_time|missing_background|missing_image_callback|missing_label_callback|mode_callbacks|mouse|mouse_hide_time|name|narrator_menu|nearest_neighbor|new_substitutions|nvl_adv_transition|nvl_layer|nvl_page_ctc|nvl_page_ctc_position|nvl_paged_rollback|old_substitutions|overlay_during_with|overlay_functions|overlay_layers|periodic_callback|predict_statements|profile|python_callbacks|quicksave_slots|quit_action|rollback_enabled|rollback_length|save_directory|save_dump|save_json_callbacks|save_physical_size|savedir|say_allow_dismiss|say_attribute_transition|say_layer|say_menu_text_filter|say_sustain_callbacks|scene|screen_height|screen_width|screenshot_callback|screenshot_crop|screenshot_pattern|script_version|search_prefixes|searchpath|show|side_image_only_not_showing|side_image_tag|skip_delay|skip_indicator|sound|sound_sample_rate|start_callbacks|start_interact_callbacks|thumbnail_height|thumbnail_width|top_layers|transform_uses_child_position|transient_layers|transition_screens|translations|variants|version|voice_filename_format|window_auto_hide|window_auto_show|window_hide_transition|window_icon|window_overlay_functions|window_show_transition|window_title|windows_icon|with_callback)\\b", "name": "support.function.renpy" + }, + { + "include": "source.python" } ], "end": "\n" @@ -246,6 +264,9 @@ "2":{"name":"keyword.control.flow.renpy"}, "3":{"name":"variable.renpy"} }, + "patterns": [ + {"include": "source.python"} + ], "end": "\n" } ] diff --git a/RenpyLanguage.tmLanguage b/RenpyLanguage.tmLanguage index 227f68e..9450335 100644 --- a/RenpyLanguage.tmLanguage +++ b/RenpyLanguage.tmLanguage @@ -72,15 +72,29 @@ include #python + + include + source.python + - include - #python match - ^(\s*)(\$)(.*) + ^(\s*)(\$)$ +? name source.python.renpy + patterns + + + include + #python + + + include + source.python + + begin @@ -103,6 +117,10 @@ include #init + + include + source.python + @@ -137,6 +155,10 @@ include #screen + + include + source.python + @@ -175,6 +197,10 @@ include #atl + + include + source.python + @@ -203,6 +229,10 @@ include #transform + + include + source.python + @@ -231,6 +261,10 @@ include #transform + + include + source.python + @@ -254,15 +288,29 @@ include #python + + include + source.python + - include - #python match - ^(\s*)(\$)(.*) + ^(\s*)(\$)$ +? name source.python.renpy + patterns + + + include + #python + + + include + source.python + + begin @@ -285,11 +333,15 @@ include #init + + include + source.python + include - #default + source.python repository @@ -336,6 +388,10 @@ name support.function.renpy + + include + source.python + @@ -411,6 +467,13 @@ end + patterns + + + include + source.python + + diff --git a/TODO.txt b/TODO.txt index e03b18f..881857c 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,2 +1,11 @@ Indent doesn't work properly for "python:", as it's in the -source.python context, rather than the source.renpy context. \ No newline at end of file +source.python context, rather than the source.renpy context. + +- ground inside imagemaps isn't orange like xpos and stuff +- the "# The two window variant." comment in say screen has window variant in pink +- Comments are the same color as all text apart from keywords, I think it's nice if comments have different colors though(Maybe just because I'm used to it since the other editors I use have it like this and it was like this before?) +- Strings are white just as everything else(they were dark yellow before I think?) +- I believe numbers had a different color before? +- If/else/for are white +- input(eg in input screen) is white +- init/style aren't working properly(see image) \ No newline at end of file diff --git a/messages.json b/messages.json index ecb87ec..8919585 100644 --- a/messages.json +++ b/messages.json @@ -10,5 +10,6 @@ "1.1.0": "messages/1.1.0.txt", "1.1.01": "messages/1.1.1.txt", "1.1.02": "messages/1.1.2.txt", - "1.1.03": "messages/1.1.3.txt" + "1.1.03": "messages/1.1.3.txt", + "1.1.04": "messages/1.1.4.txt" } diff --git a/messages/1.1.4.txt b/messages/1.1.4.txt new file mode 100644 index 0000000..05b72dd --- /dev/null +++ b/messages/1.1.4.txt @@ -0,0 +1,7 @@ +Sublime Renpy v1.1.4 +====================== + +Bugfixes: +-Comments, numbers and strings now act as they should +-Python keywords are now highlighted appropriately +-Python functions are now suggested within the appropriate contexts \ No newline at end of file