Skip to content

Commit

Permalink
Merge pull request #1934 from SublimeLinter/maint-38-switch
Browse files Browse the repository at this point in the history
  • Loading branch information
kaste committed Apr 16, 2024
2 parents b83d0c7 + 1069577 commit 10968e7
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 323 deletions.
6 changes: 5 additions & 1 deletion README.md
Expand Up @@ -11,7 +11,11 @@ No linters included: get them via [Package Control](https://packagecontrol.io/se

## Installation

Note: *** We're in a transition phase to the newer ST4 plugin host. Unless we have
Please note: The current stable version of Sublime Text, Build 4169, has a bug and cannot install
SublimeLinter without requiring a restart. You're fine if you have a later dev build, e.g.
build 4173.

*** We're in a transition phase to the newer ST4 plugin host. Unless we have
more experience for the process, it _may_ be necessary to restart Sublime Text
after installing or upgrading helper packages. Just check if everything works
or if the console shows permanent errors. On my machine, no restarts were
Expand Down
4 changes: 2 additions & 2 deletions busy_indicator_view.py
Expand Up @@ -32,7 +32,7 @@

def plugin_loaded():
active_view = sublime.active_window().active_view()
if util.is_lintable(active_view):
if active_view and util.is_lintable(active_view):
State.update({
'active_view': active_view
})
Expand All @@ -54,7 +54,7 @@ def on_begin_linting(filename):
active_view = State['active_view']
if active_view and util.canonical_filename(active_view) == filename:
sublime.set_timeout_async(
lambda: draw(active_view, filename), # type: ignore # mypy bug
lambda: draw(active_view, filename),
INITIAL_DELAY * 1000
)

Expand Down
15 changes: 4 additions & 11 deletions goto_commands.py
Expand Up @@ -93,14 +93,7 @@ def move_to(view, point):
view.run_command('sublime_linter_move_cursor', {'point': point})


if int(sublime.version()) < 4000:
from Default import history_list

def add_selection_to_jump_history(view):
history_list.get_jump_history_for_view(view).push_selection(view)

else:
def add_selection_to_jump_history(view):
view.run_command("add_jump_record", {
"selection": [(r.a, r.b) for r in view.sel()]
})
def add_selection_to_jump_history(view):
view.run_command("add_jump_record", {
"selection": [(r.a, r.b) for r in view.sel()]
})
1 change: 1 addition & 0 deletions lint/util.py
Expand Up @@ -228,6 +228,7 @@ def get_syntax(view):


def is_lintable(view):
# type: (sublime.View) -> bool
"""
Return true when a view is not lintable, e.g. scratch, read_only, etc.
Expand Down
5 changes: 5 additions & 0 deletions messages/install.txt
Expand Up @@ -6,6 +6,11 @@
|____/ \__,_|_.__/|_|_|_| |_| |_|\___|_____|_|_| |_|\__\___|_|


*** As of April 2024, the current stable version of Sublime Text, Build 4169,
has a bug and cannot install SublimeLinter without a restart. You're fine
if you have a later dev build, e.g. build 4173 has a better experience. ***


Welcome to SublimeLinter, a linter framework for Sublime Text.

Linters are not included, they must be installed separately.
Expand Down
1 change: 0 additions & 1 deletion tests/test_regex_parsing.py
Expand Up @@ -27,7 +27,6 @@
verify,
)

version = sublime.version()

RUNNING_ON_LINUX_TRAVIS = os.environ.get('TRAVIS_OS_NAME') == 'linux'
expectedFailureOnLinuxTravis = expectedFailure if RUNNING_ON_LINUX_TRAVIS else lambda f: f
Expand Down
Binary file removed vendor/bin/jsonschema.exe
Binary file not shown.
111 changes: 0 additions & 111 deletions vendor/jsonschema-2.6.0.dist-info/DESCRIPTION.rst

This file was deleted.

1 change: 0 additions & 1 deletion vendor/jsonschema-2.6.0.dist-info/INSTALLER

This file was deleted.

137 changes: 0 additions & 137 deletions vendor/jsonschema-2.6.0.dist-info/METADATA

This file was deleted.

48 changes: 0 additions & 48 deletions vendor/jsonschema-2.6.0.dist-info/RECORD

This file was deleted.

Empty file.
6 changes: 0 additions & 6 deletions vendor/jsonschema-2.6.0.dist-info/WHEEL

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/jsonschema-2.6.0.dist-info/entry_points.txt

This file was deleted.

1 change: 0 additions & 1 deletion vendor/jsonschema-2.6.0.dist-info/metadata.json

This file was deleted.

1 change: 0 additions & 1 deletion vendor/jsonschema-2.6.0.dist-info/top_level.txt

This file was deleted.

0 comments on commit 10968e7

Please sign in to comment.