diff --git a/language/ahk.tmLanguage.yaml b/language/ahk.tmLanguage.yaml index 2fa92e22..8c2d6d5a 100644 --- a/language/ahk.tmLanguage.yaml +++ b/language/ahk.tmLanguage.yaml @@ -104,7 +104,7 @@ repository: name: support.function.ahk example: .length - match: >- - \b(?!MsgBox)(?i:a_ahkpath|a_args|a_listlines|a_sendmode|a_sendlevel|a_storecapslockmode|a_coordmodetooltip|a_coordmodepixel|a_coordmodemouse|a_coordmodecaret|a_coordmodemenu|a_timeidlekeyboard|a_timeidlemouse|a_defaultgui|a_defaultlistview|a_defaulttreeview|a_comspec|a_ahkversion|a_appdata|a_appdatacommon|a_autotrim|a_batchlines|a_caretx|a_carety|a_computername|a_controldelay|a_cursor|a_dd|a_ddd|a_dddd|a_defaultmousespeed|a_desktop|a_desktopcommon|a_detecthiddentext|a_detecthiddenwindows|a_endchar|a_eventinfo|a_exitreason|a_fileencoding|a_formatfloat|a_formatinteger|a_gui|a_guievent|a_guicontrol|a_guicontrolevent|a_guiheight|a_guiwidth|a_guix|a_guiy|a_hour|a_iconfile|a_iconhidden|a_iconnumber|a_icontip|a_index|a_ipaddress1|a_ipaddress2|a_ipaddress3|a_ipaddress4|a_is64bitos|a_isadmin|a_iscompiled|a_iscritical|a_ispaused|a_issuspended|a_isunicode|a_keydelay|a_language|a_lasterror|a_linefile|a_linenumber|a_loopfield|a_loopfileattrib|a_loopfiledir|a_loopfileext|a_loopfilefullpath|a_loopfilelongpath|a_loopfilename|a_loopfileshortname|a_loopfileshortpath|a_loopfilesize|a_loopfilesizekb|a_loopfilesizemb|a_loopfiletimeaccessed|a_loopfiletimecreated|a_loopfiletimemodified|a_loopreadline|a_loopregkey|a_loopregname|a_loopregsubkey|a_loopregtimemodified|a_loopregtype|a_mday|a_min|a_mm|a_mmm|a_mmmm|a_mon|a_mousedelay|a_msec|a_mydocuments|a_now|a_nowutc|a_numbatchlines|a_ostype|a_osversion|a_priorhotkey|a_priorkey|a_programfiles|a_programs|a_programscommon|a_ptrsize|a_regview|a_screendpi|a_screenheight|a_screenwidth|a_scriptdir|a_scriptfullpath|a_scripthwnd|a_scriptname|a_sec|a_space|a_startmenu|a_startmenucommon|a_startup|a_startupcommon|a_stringcasesense|a_tab|a_temp|a_thisfunc|a_thishotkey|a_thislabel|a_thismenu|a_thismenuitem|a_thismenuitempos|a_tickcount|a_timeidle|a_timeidlephysical|a_timesincepriorhotkey|a_timesincethishotkey|a_titlematchmode|a_titlematchmodespeed|a_username|a_wday|a_windelay|a_windir|a_workingdir|a_yday|a_year|a_yweek|a_yyyy|clipboard|clipboardall|comspec|errorlevel|programfiles|true|false)\b + \b(?!MsgBox)(?i:a_ahkpath|a_args|a_listlines|a_sendmode|a_sendlevel|a_storecapslockmode|a_coordmodetooltip|a_coordmodepixel|a_coordmodemouse|a_coordmodecaret|a_coordmodemenu|a_timeidlekeyboard|a_timeidlemouse|a_defaultgui|a_defaultlistview|a_defaulttreeview|a_comspec|a_ahkversion|a_appdata|a_appdatacommon|a_autotrim|a_batchlines|a_caretx|a_carety|a_clipboard|a_computername|a_controldelay|a_cursor|a_dd|a_ddd|a_dddd|a_defaultmousespeed|a_desktop|a_desktopcommon|a_detecthiddentext|a_detecthiddenwindows|a_endchar|a_eventinfo|a_exitreason|a_fileencoding|a_formatfloat|a_formatinteger|a_gui|a_guievent|a_guicontrol|a_guicontrolevent|a_guiheight|a_guiwidth|a_guix|a_guiy|a_hour|a_iconfile|a_iconhidden|a_iconnumber|a_icontip|a_index|a_initialworkingdir|a_ipaddress1|a_ipaddress2|a_ipaddress3|a_ipaddress4|a_is64bitos|a_isadmin|a_iscompiled|a_iscritical|a_ispaused|a_issuspended|a_isunicode|a_keydelayplay|a_keydelay|a_keydurationplay|a_keyduration|a_language|a_lasterror|a_linefile|a_linenumber|a_loopfield|a_loopfileattrib|a_loopfiledir|a_loopfileext|a_loopfilefullpath|a_loopfilelongpath|a_loopfilename|a_loopfilepath|a_loopfileshortname|a_loopfileshortpath|a_loopfilesize|a_loopfilesizekb|a_loopfilesizemb|a_loopfiletimeaccessed|a_loopfiletimecreated|a_loopfiletimemodified|a_loopreadline|a_loopregkey|a_loopregname|a_loopregsubkey|a_loopregtimemodified|a_loopregtype|a_mday|a_min|a_mm|a_mmm|a_mmmm|a_mon|a_mousedelayplay|a_mousedelay|a_msec|a_mydocuments|a_now|a_nowutc|a_numbatchlines|a_ostype|a_osversion|a_priorhotkey|a_priorkey|a_programfiles|a_programs|a_programscommon|a_ptrsize|a_regview|a_screendpi|a_screenheight|a_screenwidth|a_scriptdir|a_scriptfullpath|a_scripthwnd|a_scriptname|a_sec|a_space|a_startmenu|a_startmenucommon|a_startup|a_startupcommon|a_stringcasesense|a_tab|a_temp|a_thisfunc|a_thishotkey|a_thislabel|a_thismenu|a_thismenuitem|a_thismenuitempos|a_tickcount|a_timeidle|a_timeidlephysical|a_timesincepriorhotkey|a_timesincethishotkey|a_titlematchmode|a_titlematchmodespeed|a_username|a_wday|a_windelay|a_windir|a_workingdir|a_yday|a_year|a_yweek|a_yyyy|clipboard|clipboardall|comspec|errorlevel|programfiles|true|false)\b name: constant.language.ahk example: A_ScriptDir keyword: @@ -113,11 +113,11 @@ repository: name: support.class.ahk example: this - match: >- - \b(?!MsgBox)(?i:new|__New|__Delete|shift|lshift|rshift|alt|lalt|ralt|control|lcontrol|rcontrol|ctrl|lctrl|rctrl|lwin|rwin|appskey|altdown|altup|shiftdown|shiftup|ctrldown|ctrlup|lwindown|lwinup|rwindown|rwinup|lbutton|rbutton|mbutton|wheelup|wheelleft|wheelright|wheeldown|xbutton1|xbutton2|joy1|joy2|joy3|joy4|joy5|joy6|joy7|joy8|joy9|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy30|joy31|joy32|joyx|joyy|joyz|joyr|joyu|joyv|joypov|joyname|joybuttons|joyaxes|joyinfo|space|tab|enter|escape|esc|backspace|bs|delete|del|insert|ins|pgup|pgdn|home|end|up|down|left|right|printscreen|ctrlbreak|pause|scrolllock|capslock|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadmult|numpadadd|numpadsub|numpaddiv|numpaddot|numpaddel|numpadins|numpadclear|numpadup|numpaddown|numpadleft|numpadright|numpadhome|numpadend|numpadpgup|numpadpgdn|numpadenter|f1|f2|f3|f4|f5|f6|f7|f8|f9|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f20|f21|f22|f23|f24|browser_back|browser_forward|browser_refresh|browser_stop|browser_search|browser_favorites|browser_home|volume_mute|volume_down|volume_up|media_next|media_prev|media_stop|media_play_pause|launch_mail|launch_media|launch_app1|launch_app2|vk\d+|sc\d+)\b(?!\s*\()\b + \b(?!MsgBox)(?i:new|__New|__Delete|__Set|__Get|__Call|shift|lshift|rshift|alt|lalt|ralt|control|lcontrol|rcontrol|ctrl|lctrl|rctrl|lwin|rwin|appskey|altdown|altup|shiftdown|shiftup|ctrldown|ctrlup|lwindown|lwinup|rwindown|rwinup|lbutton|rbutton|mbutton|wheelup|wheelleft|wheelright|wheeldown|xbutton1|xbutton2|joy1|joy2|joy3|joy4|joy5|joy6|joy7|joy8|joy9|joy10|joy11|joy12|joy13|joy14|joy15|joy16|joy17|joy18|joy19|joy20|joy21|joy22|joy23|joy24|joy25|joy26|joy27|joy28|joy29|joy30|joy31|joy32|joyx|joyy|joyz|joyr|joyu|joyv|joypov|joyname|joybuttons|joyaxes|joyinfo|space|tab|enter|escape|esc|backspace|bs|delete|del|insert|ins|pgup|pgdn|home|end|up|down|left|right|printscreen|ctrlbreak|pause|scrolllock|capslock|numlock|numpad0|numpad1|numpad2|numpad3|numpad4|numpad5|numpad6|numpad7|numpad8|numpad9|numpadmult|numpadadd|numpadsub|numpaddiv|numpaddot|numpaddel|numpadins|numpadclear|numpadup|numpaddown|numpadleft|numpadright|numpadhome|numpadend|numpadpgup|numpadpgdn|numpadenter|f1|f2|f3|f4|f5|f6|f7|f8|f9|f10|f11|f12|f13|f14|f15|f16|f17|f18|f19|f20|f21|f22|f23|f24|browser_back|browser_forward|browser_refresh|browser_stop|browser_search|browser_favorites|browser_home|volume_mute|volume_down|volume_up|media_next|media_prev|media_stop|media_play_pause|launch_mail|launch_media|launch_app1|launch_app2|vk\d+|sc\d+)\b(?!\s*\()\b name: keyword.keys.ahk example: LButton - match: >- - \b(?!MsgBox)(?- diff --git a/src/test/suite/grammar/samples/ahk-explorer.ahk.snap b/src/test/suite/grammar/samples/ahk-explorer.ahk.snap index 0cbd4783..cde5dd1f 100644 --- a/src/test/suite/grammar/samples/ahk-explorer.ahk.snap +++ b/src/test/suite/grammar/samples/ahk-explorer.ahk.snap @@ -5417,7 +5417,7 @@ # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk >files:=array_ToSpacedString(getSelectedPaths()) -#^^^^^ source.ahk variable.def.ahk +#^^^^^ source.ahk keyword.other.ahk # ^^ source.ahk keyword.operator.assignment.ahk # ^^^^^^^^^^^^^^^^^^^^ source.ahk entity.name.function.ahk # ^ source.ahk punctuation.bracket.ahk @@ -5437,7 +5437,7 @@ # ^^^^^^^^^^^ source.ahk variable.def.ahk # ^ source.ahk # ^ source.ahk punctuation.definition.variable.percent.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk punctuation.definition.variable.percent.ahk >soundplay, *-1 #^^^^^^^^^ source.ahk support.function.ahk @@ -5614,7 +5614,7 @@ # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk >files:=StrSplit(clipboard, "`n","`r") -#^^^^^ source.ahk variable.def.ahk +#^^^^^ source.ahk keyword.other.ahk # ^^ source.ahk keyword.operator.assignment.ahk # ^^^^^^^^ source.ahk support.function.ahk # ^ source.ahk punctuation.bracket.ahk @@ -5639,7 +5639,7 @@ # ^ source.ahk # ^^ source.ahk keyword.other.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk >fileExist:=FileExist(v) @@ -11193,7 +11193,7 @@ # ^^^^^^^^^^ source.ahk variable.def.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk punctuation.bracket.ahk >{ #^ source.ahk punctuation.bracket.ahk @@ -11329,7 +11329,7 @@ # ^ source.ahk # ^^ source.ahk keyword.other.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk >;IShellFolder:ParseDisplayName @@ -13896,7 +13896,7 @@ # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk >files:=StrSplit(clipboard, "`n","`r") -#^^^^^ source.ahk variable.def.ahk +#^^^^^ source.ahk keyword.other.ahk # ^^ source.ahk keyword.operator.assignment.ahk # ^^^^^^^^ source.ahk support.function.ahk # ^ source.ahk punctuation.bracket.ahk @@ -13921,7 +13921,7 @@ # ^ source.ahk # ^^ source.ahk keyword.other.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk >fileExist:=FileExist(v) @@ -14060,7 +14060,7 @@ # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk >files:=StrSplit(clipboard, "`n","`r") -#^^^^^ source.ahk variable.def.ahk +#^^^^^ source.ahk keyword.other.ahk # ^^ source.ahk keyword.operator.assignment.ahk # ^^^^^^^^ source.ahk support.function.ahk # ^ source.ahk punctuation.bracket.ahk @@ -14097,7 +14097,7 @@ # ^ source.ahk # ^^ source.ahk keyword.other.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk >fileExist:=FileExist(v) @@ -17579,10 +17579,10 @@ # ^^ source.ahk keyword.operator.assignment.ahk # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk -# ^^^^ source.ahk variable.def.ahk +# ^^^^ source.ahk keyword.other.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk punctuation.bracket.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.keys.ahk # ^ source.ahk punctuation.ahk # ^^^^ source.ahk support.function.ahk # ^ source.ahk punctuation.bracket.ahk @@ -17822,10 +17822,10 @@ # ^^ source.ahk keyword.operator.assignment.ahk # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk -# ^^^^ source.ahk variable.def.ahk +# ^^^^ source.ahk keyword.other.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk punctuation.bracket.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.keys.ahk # ^ source.ahk punctuation.ahk # ^^^^ source.ahk support.function.ahk # ^ source.ahk punctuation.bracket.ahk @@ -20815,7 +20815,7 @@ #^^^^ source.ahk keyword.control.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk # ^ source.ahk punctuation.definition.variable.percent.ahk @@ -21122,7 +21122,7 @@ #^^^^ source.ahk keyword.control.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk # ^ source.ahk punctuation.definition.variable.percent.ahk @@ -21326,7 +21326,7 @@ #^^^^ source.ahk keyword.control.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk # ^ source.ahk punctuation.definition.variable.percent.ahk @@ -22013,7 +22013,7 @@ # ^^^^^^^^^^ source.ahk variable.def.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk punctuation.ahk # ^ source.ahk # ^^^^^^^^ source.ahk variable.def.ahk @@ -22244,7 +22244,7 @@ # ^ source.ahk # ^^ source.ahk keyword.other.ahk # ^ source.ahk -# ^^^^^ source.ahk variable.def.ahk +# ^^^^^ source.ahk keyword.other.ahk # ^ source.ahk # ^ source.ahk punctuation.bracket.ahk >;IShellFolder:ParseDisplayName