Skip to content

Commit

Permalink
Merge branch 'main' into add-additional-intellij-refactorings
Browse files Browse the repository at this point in the history
  • Loading branch information
jaresty authored Oct 14, 2024
2 parents 67f7c3d + 09d0d04 commit 81f6d3a
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
minimum_pre_commit_version: "3.2.0"
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand Down Expand Up @@ -35,7 +35,7 @@ repos:
hooks:
- id: isort
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black
- repo: https://github.com/Lucas-C/pre-commit-hooks
Expand Down
4 changes: 2 additions & 2 deletions apps/brave/brave.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

mod.apps.brave = "app.name: Brave Browser"
mod.apps.brave = "app.name: Brave-browser"
mod.apps.brave = """
mod.apps.brave = r"""
os: windows
and app.exe: brave.exe
and app.exe: /^brave\.exe$/i
os: linux
and app.exe: brave
os: mac
Expand Down
6 changes: 3 additions & 3 deletions apps/calibre/calibre.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

# --- App definition ---
mod = Module()
mod.apps.calibre = """
mod.apps.calibre = r"""
os: windows
and app.name: calibre.exe
os: windows
and app.exe: calibre.exe
and app.exe: /^calibre\.exe$/i
os: windows
and app.name: calibre-parallel.exe
os: windows
and app.exe: calibre-parallel.exe
and app.exe: /^calibre-parallel\.exe$/i
"""
mod.apps.calibre = """
os: linux
Expand Down
4 changes: 2 additions & 2 deletions apps/chrome/chrome.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
mod = Module()

mod.apps.chrome = "app.name: Google Chrome"
mod.apps.chrome = """
mod.apps.chrome = r"""
os: windows
and app.exe: chrome.exe
and app.exe: /^chrome\.exe$/i
"""
mod.apps.chrome = """
os: mac
Expand Down
4 changes: 2 additions & 2 deletions apps/edge/edge.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
mod = Module()
ctx = Context()

mod.apps.microsoft_edge = """
mod.apps.microsoft_edge = r"""
os: windows
and app.name: msedge.exe
os: windows
and app.name: Microsoft Edge
os: windows
and app.exe: msedge.exe
and app.exe: /^msedge\.exe$/i
os: mac
and app.bundle: com.microsoft.edgemac
os: linux
Expand Down
4 changes: 2 additions & 2 deletions apps/emacs/emacs.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
os: mac
app.bundle: org.gnu.Emacs
"""
mod.apps.emacs = """
mod.apps.emacs = r"""
os: windows
app.exe: emacs.exe
app.exe: /^emacs\.exe$/i
"""

ctx = Context()
Expand Down
4 changes: 2 additions & 2 deletions apps/firefox/firefox.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
apps.firefox = "app.name: firefox-esr"
apps.firefox = "app.name: LibreWolf"
apps.firefox = "app.name: waterfox"
apps.firefox = """
apps.firefox = r"""
os: windows
and app.name: Firefox
os: windows
and app.exe: firefox.exe
and app.exe: /^firefox\.exe$/i
"""
apps.firefox = """
os: mac
Expand Down
10 changes: 5 additions & 5 deletions apps/jetbrains/jetbrains.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,20 @@ def idea_commands(commands):
and app.bundle: com.google.android.studio
"""
# windows
mod.apps.jetbrains = "app.exe: idea64.exe"
mod.apps.jetbrains = "app.exe: /^PyCharm64\.exe$/i"
mod.apps.jetbrains = "app.exe: webstorm64.exe"
mod.apps.jetbrains = r"app.exe: /^idea64\.exe$/i"
mod.apps.jetbrains = r"app.exe: /^PyCharm64\.exe$/i"
mod.apps.jetbrains = r"app.exe: /^webstorm64\.exe$/i"
mod.apps.jetbrains = """
os: mac
and app.bundle: com.jetbrains.pycharm
os: mac
and app.bundle: com.jetbrains.rider
"""
mod.apps.jetbrains = """
mod.apps.jetbrains = r"""
os: windows
and app.name: JetBrains Rider
os: windows
and app.exe: rider64.exe
and app.exe: /^rider64\.exe$/i
"""


Expand Down
4 changes: 2 additions & 2 deletions apps/notepad++/notepad++_win.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
ctx = Context()

apps = mod.apps
apps.notepad_plus_plus = """
apps.notepad_plus_plus = r"""
os: windows
and app.name: Notepad++ : a free (GNU) source code editor
os: windows
and app.name: Notepad++ : a free (GPL) source code editor
os: windows
and app.exe: notepad++.exe
and app.exe: /^notepad\+\+\.exe$/i
"""

ctx.matches = r"""
Expand Down
4 changes: 2 additions & 2 deletions apps/okular/okular.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

# --- App definition ---
mod = Module()
mod.apps.okular = """
mod.apps.okular = r"""
os: windows
and app.name: okular.exe
os: windows
and app.exe: okular.exe
and app.exe: /^okular\.exe$/i
"""
mod.apps.okular = """
os: linux
Expand Down
4 changes: 2 additions & 2 deletions apps/opera/opera.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
os: mac
and app.bundle: com.operasoftware.Opera
"""
apps.opera = """
apps.opera = r"""
os: windows
and app.exe: opera.exe
and app.exe: /^opera\.exe$/i
"""
apps.opera = """
os: linux
Expand Down
4 changes: 2 additions & 2 deletions apps/slack/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
mod = Module()
apps = mod.apps
apps.slack = "app.name: Slack"
mod.apps.slack = """
mod.apps.slack = r"""
os: windows
and app.name: Slack
os: windows
and app.exe: slack.exe
and app.exe: /^slack\.exe$/i
"""
apps.slack = """
os: mac
Expand Down
4 changes: 2 additions & 2 deletions apps/thunderbird/thunderbird.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
# --- App definitions ---
# Main app TODO: mac context
mod = Module()
mod.apps.thunderbird = """
mod.apps.thunderbird = r"""
os: windows
and app.name: Thunderbird
os: windows
and app.exe: thunderbird.exe
and app.exe: /^thunderbird\.exe$/i
"""
mod.apps.thunderbird = """
os: linux
Expand Down
4 changes: 2 additions & 2 deletions apps/vivaldi/vivaldi.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

mod.apps.vivaldi = "app.name: Vivaldi"
mod.apps.vivaldi = "app.name: Vivaldi-stable"
mod.apps.vivaldi = """
mod.apps.vivaldi = r"""
os: windows
and app.exe: vivaldi.exe
and app.exe: /^vivaldi\.exe$/i
os: linux
and app.exe: vivaldi-bin
os: mac
Expand Down
2 changes: 1 addition & 1 deletion apps/vscode/vscode.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
os: windows
and app.name: Azure Data Studio
os: windows
and app.exe: azuredatastudio.exe
and app.exe: /^azuredatastudio\.exe$/i
"""

ctx.matches = r"""
Expand Down
4 changes: 2 additions & 2 deletions apps/windows_explorer/windows_explorer.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
mod = Module()
apps = mod.apps

apps.windows_explorer = """
apps.windows_explorer = r"""
os: windows
and app.name: Windows Explorer
os: windows
and app.name: Windows-Explorer
os: windows
and app.exe: /explorer.exe/i
and app.exe: /^explorer\.exe$/i
"""

# many commands should work in most save/open dialog.
Expand Down
12 changes: 6 additions & 6 deletions core/application_matches.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,21 @@
and app.name: /termite/
"""

apps.windows_command_processor = """
apps.windows_command_processor = r"""
os: windows
and app.name: Windows Command Processor
os: windows
and app.exe: cmd.exe
and app.exe: /^cmd\.exe$/i
"""

apps.windows_terminal = """
apps.windows_terminal = r"""
os: windows
and app.exe: WindowsTerminal.exe
and app.exe: /^windowsterminal\.exe$/i
"""

mod.apps.windows_power_shell = """
mod.apps.windows_power_shell = r"""
os: windows
and app.exe: powershell.exe
and app.exe: /^powershell\.exe$/i
"""

apps.vim = """
Expand Down

0 comments on commit 81f6d3a

Please sign in to comment.