From b03f754824f5876cad7eccbd3854794047bccdfd Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Mon, 11 Aug 2025 18:17:47 +0400 Subject: [PATCH] IJPL-201509 TextMate plugin converted to v2 - remdev-friendly v2 layout - tests moved to a separate module and merged - introduced JBC plugin - fe part located separately, see IJPL-179111 GitOrigin-RevId: 2f5b378387779fecccd2902e56bc5c4bd644650c --- .idea/modules.xml | 4 ++ BUILD.bazel | 4 +- build/bazel-generated-file-list.txt | 4 ++ intellij.idea.community.main.iml | 3 +- .../intellij/build/BaseIdeaProperties.kt | 2 +- .../build/CommunityRepositoryModules.kt | 4 +- .../intellij/ide/plugins/PluginGraphWriter.kt | 3 +- plugins/textmate/BUILD.bazel | 51 +--------------- plugins/textmate/backend/BUILD.bazel | 16 +++++ .../backend/intellij.textmate.backend.iml | 11 ++++ .../resources/intellij.textmate.backend.xml | 6 ++ plugins/textmate/common/BUILD.bazel | 16 +++++ .../common/intellij.textmate.common.iml | 11 ++++ .../resources/intellij.textmate.common.xml | 7 +++ plugins/textmate/core/BUILD.bazel | 49 +++++----------- .../textmate/core/intellij.textmate.core.iml | 12 +--- .../core/resources/intellij.textmate.core.xml | 2 + .../language/syntax/lexer/SyntaxMatchUtils.kt | 2 +- .../plugins/textmate/regex/RegexUtil.kt | 2 +- .../plugins/textmate/regex/TextMateRange.kt | 14 ++--- .../plugins/textmate/Multiplatform.kt | 2 +- plugins/textmate/intellij.textmate.iml | 3 - plugins/textmate/joni/BUILD.bazel | 37 ++++-------- .../textmate/joni/intellij.textmate.joni.iml | 3 +- .../joni/resources/intellij.textmate.joni.xml | 5 ++ plugins/textmate/plugin-content.yaml | 13 ----- plugins/textmate/plugin/BUILD.bazel | 16 +++++ .../plugin/intellij.textmate.plugin.iml | 11 ++++ plugins/textmate/plugin/plugin-content.yaml | 26 +++++++++ .../plugin/resources/META-INF/plugin.xml | 26 +++++++++ .../plugin.xml => intellij.textmate.xml} | 20 ++----- plugins/textmate/tests/BUILD.bazel | 58 +++++++++++++++++++ .../tests/intellij.textmate.tests.iml | 34 +++++++++++ .../astro-language-configuration.json | 0 .../astro/languages/astro.code-snippets | 0 .../testData/bundles/astro/package.json | 0 .../astro/syntaxes/astro.tmLanguage-1.json | 0 .../astro/syntaxes/astro.tmLanguage.json | 0 .../syntaxes/markdown.astro.tmLanguage.json | 0 .../astro/syntaxes/mdx.astro.tmLanguage.json | 0 .../testData/bundles/bat/.vscodeignore | 0 .../testData/bundles/bat/cgmanifest.json | 0 .../bundles/bat/language-configuration.json | 0 .../testData/bundles/bat/package.json | 0 .../testData/bundles/bat/package.nls.json | 0 .../bat/snippets/batchfile.snippets.json | 0 .../bat/syntaxes/batchfile.tmLanguage.json | 0 .../bat/test/colorize-fixtures/test.bat | 0 .../bat/test/colorize-results/test_bat.json | 0 .../bundles/chef/Snippets/chef_log.tmSnippet | 0 .../chef/Snippets/cookbook_file.tmSnippet | 0 .../bundles/chef/Snippets/cron.tmSnippet | 0 .../bundles/chef/Snippets/directory.tmSnippet | 0 .../bundles/chef/Snippets/execute.tmSnippet | 0 .../bundles/chef/Snippets/file.tmSnippet | 0 .../chef/Snippets/gem_package.tmSnippet | 0 .../bundles/chef/Snippets/group.tmSnippet | 0 .../chef/Snippets/http_request.tmSnippet | 0 .../bundles/chef/Snippets/link.tmSnippet | 0 .../bundles/chef/Snippets/package.tmSnippet | 0 .../bundles/chef/Snippets/remote.tmSnippet | 0 .../chef/Snippets/ruby_block.tmSnippet | 0 .../bundles/chef/Snippets/script.tmSnippet | 0 .../bundles/chef/Snippets/service.tmSnippet | 0 .../chef/Snippets/system_user.tmSnippet | 0 .../bundles/chef/Snippets/template.tmSnippet | 0 .../bundles/chef/Snippets/user.tmSnippet | 0 .../bundles/chef/Syntaxes/Chef.tmLanguage | 0 .../testData/bundles/chef/info.plist | 0 .../coldfusion/Syntaxes/ColdFusion.tmLanguage | 0 .../testData/bundles/coldfusion/info.plist | 0 .../testData/bundles/css_vsc/package.json | 0 .../css_vsc/syntaxes/css.tmLanguage.json | 0 .../elixir/Preferences/Comments.tmPreferences | 0 .../elixir/Preferences/Indent.tmPreferences | 0 .../Preferences/Typing Pairs.tmPreferences | 0 .../bundles/elixir/Syntaxes/EEx.tmLanguage | 0 .../bundles/elixir/Syntaxes/Elixir.tmLanguage | 0 .../elixir/Syntaxes/HTML (EEx).tmLanguage | 0 .../testData/bundles/elixir/info.plist | 0 .../bundles/html/Preferences/Comments.plist | 0 .../Completions HTML Attributes.tmPreferences | 0 .../Preferences/Empty tag typing pairs.plist | 0 .../html/Preferences/Folding.tmPreferences | 0 .../Indent Corrections.tmPreferences | 0 .../html/Preferences/Miscellaneous.plist | 0 .../Preferences/Tag Completions.tmPreferences | 0 .../html/Preferences/Tag preferences.plist | 0 .../Snippets/DocType HTML 4.0 Strict.plist | 0 .../html/Snippets/DocType HTML 5.plist | 0 .../Snippets/DocType XHTL 1.0 Frameset.plist | 0 .../Snippets/DocType XHTML 1.0 Strict.plist | 0 .../DocType XHTML 1.0 Transitional.plist | 0 .../html/Snippets/DocType XHTML 1.1.plist | 0 .../Snippets/Embed QT movie (movie).plist | 0 .../bundles/html/Snippets/Emphasize.tmSnippet | 0 .../bundles/html/Snippets/Fieldset.tmSnippet | 0 .../HTML 4.0 Transitional (doctype).plist | 0 ...mment_Internet Explorer 5_0 only.tmSnippet | 0 ...mment_Internet Explorer 5_5 only.tmSnippet | 0 ...al Comment_Internet Explorer 5_x.tmSnippet | 0 ...nt_Internet Explorer 6 and below.tmSnippet | 0 ...Comment_Internet Explorer 6 only.tmSnippet | 0 ...onal Comment_Internet Explorer 7.tmSnippet | 0 ...tional Comment_Internet Explorer.tmSnippet | 0 ...al Comment_NOT Internet Explorer.tmSnippet | 0 .../html/Snippets/Input with Label.tmSnippet | 0 .../bundles/html/Snippets/Option.tmSnippet | 0 .../html/Snippets/Select Box.tmSnippet | 0 .../Smart return_indent for tag pairs.plist | 0 .../bundles/html/Snippets/Strong.tmSnippet | 0 .../bundles/html/Snippets/XHTML_div.plist | 0 .../testData/bundles/html/Syntaxes/HTML.plist | 0 .../testData/bundles/html/info.plist | 0 .../testData/bundles/html_vsc/.vscodeignore | 0 .../testData/bundles/html_vsc/cgmanifest.json | 0 .../html_vsc/language-configuration.json | 0 .../testData/bundles/html_vsc/package.json | 0 .../bundles/html_vsc/package.nls.json | 0 .../syntaxes/html-derivative.tmLanguage.json | 0 .../html_vsc/syntaxes/html.tmLanguage.json | 0 .../testData/bundles/invalid_bundle/stub | 0 .../testData/bundles/javascript/.vscodeignore | 0 .../bundles/javascript/cgmanifest.json | 0 .../javascript-language-configuration.json | 0 .../testData/bundles/javascript/package.json | 0 .../bundles/javascript/package.nls.json | 0 .../javascript/schemas/jsconfig.schema.json | 0 .../javascript/snippets/javascript.json | 0 .../syntaxes/JavaScript.tmLanguage.json | 0 .../syntaxes/JavaScriptReact.tmLanguage.json | 0 .../bundles/javascript/syntaxes/Readme.md | 0 ...egular Expressions (JavaScript).tmLanguage | 0 .../tags-language-configuration.json | 0 .../testData/bundles/laravel-blade/info.plist | 0 .../laravel-blade/laravel-blade.tmLanguage | 0 .../bundles/latex/Preferences/Comments.plist | 0 ...art Typing after Backslashes.tmPreferences | 0 .../Folding - BibTeX.tmPreferences | 0 .../Preferences/Folding - LaTeX.tmPreferences | 0 .../Preferences/Folding - Log.tmPreferences | 0 .../Preferences/Folding - TeX.tmPreferences | 0 .../latex/Preferences/Miscellaneous.plist | 0 .../Smart Typing (Strings).tmPreferences | 0 .../latex/Preferences/Symbol list.plist | 0 .../latex/Preferences/TexShop comments.plist | 0 .../bundles/latex/Syntaxes/Bibtex.plist | 0 .../bundles/latex/Syntaxes/LaTeX Beamer.plist | 0 .../bundles/latex/Syntaxes/LaTeX Log.plist | 0 .../latex/Syntaxes/LaTeX Memoir.tmLanguage | 0 .../bundles/latex/Syntaxes/LaTeX.plist | 0 .../testData/bundles/latex/Syntaxes/TeX.plist | 0 .../testData/bundles/latex/info.plist | 0 .../markdown_blogging/blogging.tmLanguage | 0 .../markdown_sublime/Markdown.tmLanguage | 0 .../markdown_sublime/MultiMarkdown.tmLanguage | 0 .../Preferences/Typing_pairs.plist | 0 .../Syntaxes/Markdown.tmLanguage | 0 .../bundles/markdown_textmate/info.plist | 0 .../perl/Preferences/Folding.tmPreferences | 0 .../Preferences/Indentation.tmPreferences | 0 .../perl/Preferences/Miscellaneous.plist | 0 .../bundles/perl/Syntaxes/Perl 6.tmLanguage | 0 .../testData/bundles/perl/Syntaxes/Perl.plist | 0 .../testData/bundles/perl/info.plist | 0 .../bundles/php/Comments.tmPreferences | 0 .../php/Completion Rules.tmPreferences | 0 .../php/Indentation Rules Annex.tmPreferences | 0 .../php/Indentation Rules.tmPreferences | 0 .../testData/bundles/php/PHP.tmLanguage | 0 .../bundles/php/Symbol List.tmPreferences | 0 .../php_vsc/language-configuration.json | 0 .../testData/bundles/php_vsc/package.json | 0 .../testData/bundles/php_vsc/package.nls.json | 0 .../php_vsc/syntaxes/html.tmLanguage.json | 0 .../php_vsc/syntaxes/php.tmLanguage.json | 0 .../preferences_test/htmlOnly.tmPreferences | 0 .../preferences_test/phpOnly.tmPreferences | 0 .../preferences_test/sameScope1.tmPreferences | 0 .../preferences_test/sameScope2.tmPreferences | 0 .../testData/bundles/python/Python.tmLanguage | 0 .../Syntaxes/HTML (Ruby - ERB).tmLanguage | 0 .../testData/bundles/ruby/Syntaxes/Ruby.plist | 0 .../testData/bundles/ruby/info.plist | 0 .../Syntaxes/Shell-Unix-Bash.tmLanguage | 0 .../testData/bundles/shellscript/info.plist | 0 .../smarty/Preferences/Comments.tmPreferences | 0 .../smarty/Preferences/Folding.tmPreferences | 0 .../bundles/smarty/Syntaxes/Smarty.plist | 0 .../testData/bundles/smarty/info.plist | 0 .../testData/bundles/turtle/Turtle.tmLanguage | 0 .../editor/data/batLineCommenter.bat_hack | 0 .../data/batLineCommenter_after.bat_hack | 0 .../editor/data/blockCommenter.php_hack | 0 .../data/blockCommenterInInjection.php_hack | 0 .../data/blockCommenterInInjection_2.php_hack | 0 ...blockCommenterInInjection_2_after.php_hack | 0 .../blockCommenterInInjection_after.php_hack | 0 .../editor/data/blockCommenter_after.php_hack | 0 .../data/commenterInInjectedCode.php_hack | 0 .../commenterInInjectedCode_after.php_hack | 0 .../editor/data/jsxBlockCommenter.jsx_hack | 0 .../data/jsxBlockCommenter_after.jsx_hack | 0 .../editor/data/latexLineCommenter.tex | 0 .../editor/data/latexLineCommenter_after.tex | 0 .../editor/data/phpLineCommenter.php_hack | 0 .../data/phpLineCommenter_after.php_hack | 0 .../testData/lexer/astro/text.astro | 0 .../testData/lexer/astro/text_after.astro | 0 .../testData/lexer/bat/bat.bat_hack | 0 .../testData/lexer/bat/bat_after.bat_hack | 0 .../testData/lexer/coldfusion/coldfusion.cfm | 0 .../lexer/coldfusion/coldfusion_after.cfm | 0 .../{ => tests}/testData/lexer/cpp/test.cc | 0 .../testData/lexer/cpp/test_after.cc | 0 .../testData/lexer/docker_vsc/Dockerfile | 0 .../lexer/docker_vsc/Dockerfile_after | 0 .../testData/lexer/elixir/simpleTest.ex | 0 .../testData/lexer/elixir/simpleTest_after.ex | 0 .../{ => tests}/testData/lexer/fsharp/test.fs | 0 .../testData/lexer/fsharp/test_after.fs | 0 .../testData/lexer/git/COMMIT_EDITMSG | 0 .../testData/lexer/git/COMMIT_EDITMSG_after | 0 .../{ => tests}/testData/lexer/go/test.go | 0 .../testData/lexer/go/test_after.go | 0 .../testData/lexer/html_vsc/doctype.html | 0 .../lexer/html_vsc/doctype_after.html | 0 .../testData/lexer/html_vsc/html_css.html | 0 .../lexer/html_vsc/html_css_after.html | 0 .../{ => tests}/testData/lexer/java/java.java | 0 .../testData/lexer/java/java_after.java | 0 .../lexer/java/java_unicode_literal.java | 0 .../java/java_unicode_literal_after.java | 0 .../{ => tests}/testData/lexer/latex/text.tex | 0 .../testData/lexer/latex/text_after.tex | 0 .../{ => tests}/testData/lexer/log/log.log | 0 .../testData/lexer/log/log_after.log | 0 .../{ => tests}/testData/lexer/make/test.mk | 0 .../testData/lexer/make/test_after.mk | 0 .../testData/lexer/markdown/code.md | 0 .../testData/lexer/markdown/code_after.md | 0 .../testData/lexer/markdown/cyrillic.md | 0 .../testData/lexer/markdown/cyrillic_after.md | 0 .../lexer/markdown/header_after_paragraph.md | 0 .../markdown/header_after_paragraph_after.md | 0 .../testData/lexer/markdown/headers.md | 0 .../testData/lexer/markdown/headers_after.md | 0 .../testData/lexer/markdown/inline_bold.md | 0 .../lexer/markdown/inline_bold_after.md | 0 .../testData/lexer/markdown/link.md | 0 .../testData/lexer/markdown/link_after.md | 0 .../lexer/markdown/new_line_required_bug.md | 0 .../markdown/new_line_required_bug_after.md | 0 .../testData/lexer/markdown/numbered_list.md | 0 .../lexer/markdown/numbered_list_after.md | 0 .../testData/lexer/markdown/paragraph.md | 0 .../lexer/markdown/paragraph_after.md | 0 .../testData/lexer/markdown/unknown_utf.md | 0 .../lexer/markdown/unknown_utf_after.md | 0 .../lexer/markdown_blogging/ruby12703.blog.md | 0 .../markdown_blogging/ruby12703.blog_after.md | 0 .../markdown_blogging/ruby12703_after.blog.md | 0 .../testData/lexer/markdown_html/heading.md | 0 .../lexer/markdown_html/heading_after.md | 0 .../infinity_loop_bundle_bug.md | 0 .../infinity_loop_bundle_bug_after.md | 0 .../testData/lexer/markdown_vsc/heading.md | 0 .../lexer/markdown_vsc/heading_after.md | 0 .../lexer/markdown_vsc/inline_bold.md | 0 .../lexer/markdown_vsc/inline_bold_after.md | 0 .../lexer/markdown_vsc/unknown_utf.md | 0 .../lexer/markdown_vsc/unknown_utf_after.md | 0 .../{ => tests}/testData/lexer/perl/perl.pl | 0 .../testData/lexer/perl/perl_after.pl | 0 .../{ => tests}/testData/lexer/perl/regex.pl | 0 .../testData/lexer/perl/regex_after.pl | 0 .../testData/lexer/php/injection.php_hack | 0 .../lexer/php/injection_after.php_hack | 0 .../testData/lexer/php_html/php_html.php | 0 .../testData/lexer/php_vsc/empty.php_vsc | 0 .../lexer/php_vsc/empty_after.php_vsc | 0 .../lexer/php_vsc/escape_symbol.php_vsc | 0 .../lexer/php_vsc/escape_symbol_after.php_vsc | 0 .../testData/lexer/php_vsc/html_css.php_vsc | 0 .../lexer/php_vsc/html_css_after.php_vsc | 0 .../testData/lexer/php_vsc/slow.php_vsc | 0 .../testData/lexer/php_vsc/slow_after.php_vsc | 0 .../testData/lexer/python/dictionary.py | 0 .../testData/lexer/python/dictionary_after.py | 0 .../testData/lexer/python/selfpointer.py | 0 .../lexer/python/selfpointer_after.py | 0 .../{ => tests}/testData/lexer/rst/nested.rst | 0 .../testData/lexer/rst/nested_after.rst | 0 .../lexer/ruby/comment_at_line_start.rb | 0 .../lexer/ruby/comment_at_line_start_after.rb | 0 .../testData/lexer/shellscript/case.sh | 0 .../testData/lexer/shellscript/case_after.sh | 0 .../testData/lexer/shellscript/comment.sh | 0 .../lexer/shellscript/comment_after.sh | 0 .../testData/lexer/shellscript/heredoc.sh | 0 .../lexer/shellscript/heredoc_after.sh | 0 .../testData/lexer/smarty/injection.tpl_hack | 0 .../lexer/smarty/injection_after.tpl_hack | 0 .../testData/lexer/terraform/module.tf | 0 .../testData/lexer/terraform/module_after.tf | 0 .../lexer/terraform/split_scope_by_space.tf | 0 .../terraform/split_scope_by_space_after.tf | 0 .../local_inifinity_loop_protection.ttl | 0 .../local_inifinity_loop_protection_after.ttl | 0 .../textmate/joni/JoniRegexFacadeTest.kt | 0 .../jetbrains/plugins/textmate/TestUtil.kt | 0 .../textmate/TextMateAcceptanceTestCase.java | 2 +- .../textmate/bundles/BundleTypeTest.kt | 0 .../textmate/cache/SLRUTextMateCacheTest.kt | 0 .../editor/TextMateBraceMatcherTest.java | 0 .../editor/TextMateCommenterTest.java | 0 .../editor/TextMateCompletionTest.java | 0 .../TextMateSnippetsCompletionTest.java | 0 .../editor/TextMateTypedHandlerTest.java | 0 .../language/preferences/PreferencesTest.kt | 4 +- .../preferences/ShellVariablesTest.kt | 0 .../TextMateSnippetsLoadingTest.kt | 0 .../syntax/TextMateLexerPerformanceTest.kt | 0 .../language/syntax/TextMateLexerTestCase.kt | 2 +- .../language/syntax/lexer/AstroLexerTest.kt | 0 .../language/syntax/lexer/BatLexerTest.kt | 0 .../syntax/lexer/ColdFusionLexerTest.kt | 0 .../language/syntax/lexer/CppLexerTest.kt | 0 .../language/syntax/lexer/DockerLexerTest.kt | 0 .../language/syntax/lexer/ElixirLexerTest.kt | 0 .../language/syntax/lexer/FSharpLexerTest.kt | 0 .../language/syntax/lexer/GitLexerTest.kt | 0 .../language/syntax/lexer/GoLexerTest.kt | 0 .../language/syntax/lexer/HtmlVscLexerTest.kt | 0 .../language/syntax/lexer/JavaLexerTest.kt | 0 .../language/syntax/lexer/LatexLexerTest.kt | 0 .../language/syntax/lexer/LogLexerTest.kt | 0 .../syntax/lexer/MakefileLexerTest.kt | 0 .../syntax/lexer/MarkdownBloggingLexerTest.kt | 0 .../syntax/lexer/MarkdownHtmlLexerTest.kt | 0 .../syntax/lexer/MarkdownLexerTest.kt | 0 .../syntax/lexer/MarkdownSublimeLexerTest.kt | 0 .../syntax/lexer/MarkdownVscLexerTest.kt | 0 .../language/syntax/lexer/PerlLexerTest.kt | 0 .../language/syntax/lexer/PhpHtmlLexerTest.kt | 0 .../language/syntax/lexer/PhpVscLexerTest.kt | 0 .../language/syntax/lexer/PythonLexerTest.kt | 0 .../language/syntax/lexer/RstLexerTest.kt | 0 .../language/syntax/lexer/RubyLexerTest.kt | 0 .../syntax/lexer/ShellscriptLexerTest.kt | 0 .../syntax/lexer/SmartyPhpLexerTest.kt | 0 .../syntax/lexer/SyntaxMatchUtilsTest.kt | 0 .../syntax/lexer/TerraformLexerTest.kt | 0 .../language/syntax/lexer/TurtleLexerTest.kt | 0 .../syntax/regex/CachingRegexFacadeTest.kt | 0 .../regex/CaffeineCachingRegexFacadeTest.kt | 0 .../regex/RememberLastMatchRegexFacadeTest.kt | 0 .../TextMateCachingSelectorWeigherTest.kt | 0 .../TextMateCaffeineSelectorWeigherTest.kt | 0 .../TextMateSelectorWeigherImplTest.kt | 0 .../TextMateSelectorWeigherTestCase.kt | 0 .../plist/JsonOrXmlPlistReaderTest.kt | 0 .../textmate/plist/JsonPlistReaderTest.kt | 0 .../textmate/plist/XmlPlistReaderTest.kt | 0 .../plugins/textmate/regex/RegexFacadeTest.kt | 0 .../TextMateSpellcheckingTest.java | 0 .../plugins/textmate/TestUtilMultiplatform.kt | 2 +- .../textmate/plist/XmlPlistReaderForTests.kt | 0 python/BUILD.bazel | 5 +- python/build/plugin-list.txt | 2 +- python/intellij.pycharm.community.main.iml | 2 +- 371 files changed, 313 insertions(+), 183 deletions(-) create mode 100644 plugins/textmate/backend/BUILD.bazel create mode 100644 plugins/textmate/backend/intellij.textmate.backend.iml create mode 100644 plugins/textmate/backend/resources/intellij.textmate.backend.xml create mode 100644 plugins/textmate/common/BUILD.bazel create mode 100644 plugins/textmate/common/intellij.textmate.common.iml create mode 100644 plugins/textmate/common/resources/intellij.textmate.common.xml create mode 100644 plugins/textmate/core/resources/intellij.textmate.core.xml create mode 100644 plugins/textmate/joni/resources/intellij.textmate.joni.xml delete mode 100644 plugins/textmate/plugin-content.yaml create mode 100644 plugins/textmate/plugin/BUILD.bazel create mode 100644 plugins/textmate/plugin/intellij.textmate.plugin.iml create mode 100644 plugins/textmate/plugin/plugin-content.yaml create mode 100644 plugins/textmate/plugin/resources/META-INF/plugin.xml rename plugins/textmate/resources/{META-INF/plugin.xml => intellij.textmate.xml} (89%) create mode 100644 plugins/textmate/tests/BUILD.bazel create mode 100644 plugins/textmate/tests/intellij.textmate.tests.iml rename plugins/textmate/{ => tests}/testData/bundles/astro/languages/astro-language-configuration.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/astro/languages/astro.code-snippets (100%) rename plugins/textmate/{ => tests}/testData/bundles/astro/package.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/astro/syntaxes/astro.tmLanguage-1.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/astro/syntaxes/astro.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/astro/syntaxes/markdown.astro.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/astro/syntaxes/mdx.astro.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/bat/.vscodeignore (100%) rename plugins/textmate/{ => tests}/testData/bundles/bat/cgmanifest.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/bat/language-configuration.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/bat/package.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/bat/package.nls.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/bat/snippets/batchfile.snippets.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/bat/syntaxes/batchfile.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/bat/test/colorize-fixtures/test.bat (100%) rename plugins/textmate/{ => tests}/testData/bundles/bat/test/colorize-results/test_bat.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/chef_log.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/cookbook_file.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/cron.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/directory.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/execute.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/file.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/gem_package.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/group.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/http_request.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/link.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/package.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/remote.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/ruby_block.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/script.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/service.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/system_user.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/template.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Snippets/user.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/Syntaxes/Chef.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/chef/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/coldfusion/Syntaxes/ColdFusion.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/coldfusion/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/css_vsc/package.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/css_vsc/syntaxes/css.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/elixir/Preferences/Comments.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/elixir/Preferences/Indent.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/elixir/Preferences/Typing Pairs.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/elixir/Syntaxes/EEx.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/elixir/Syntaxes/Elixir.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/elixir/Syntaxes/HTML (EEx).tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/elixir/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Preferences/Comments.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Preferences/Completions HTML Attributes.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Preferences/Empty tag typing pairs.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Preferences/Folding.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Preferences/Indent Corrections.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Preferences/Miscellaneous.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Preferences/Tag Completions.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Preferences/Tag preferences.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/DocType HTML 4.0 Strict.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/DocType HTML 5.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/DocType XHTL 1.0 Frameset.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/DocType XHTML 1.0 Strict.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/DocType XHTML 1.0 Transitional.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/DocType XHTML 1.1.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/Embed QT movie (movie).plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/Emphasize.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/Fieldset.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/HTML 4.0 Transitional (doctype).plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_0 only.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_5 only.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_x.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 and below.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 only.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 7.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/IE Conditional Comment_NOT Internet Explorer.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/Input with Label.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/Option.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/Select Box.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/Smart return_indent for tag pairs.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/Strong.tmSnippet (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Snippets/XHTML_div.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/Syntaxes/HTML.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/html_vsc/.vscodeignore (100%) rename plugins/textmate/{ => tests}/testData/bundles/html_vsc/cgmanifest.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/html_vsc/language-configuration.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/html_vsc/package.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/html_vsc/package.nls.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/html_vsc/syntaxes/html-derivative.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/html_vsc/syntaxes/html.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/invalid_bundle/stub (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/.vscodeignore (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/cgmanifest.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/javascript-language-configuration.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/package.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/package.nls.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/schemas/jsconfig.schema.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/snippets/javascript.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/syntaxes/JavaScript.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/syntaxes/JavaScriptReact.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/syntaxes/Readme.md (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/syntaxes/Regular Expressions (JavaScript).tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/javascript/tags-language-configuration.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/laravel-blade/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/laravel-blade/laravel-blade.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/Comments.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/Disable Smart Typing after Backslashes.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/Folding - BibTeX.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/Folding - LaTeX.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/Folding - Log.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/Folding - TeX.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/Miscellaneous.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/Smart Typing (Strings).tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/Symbol list.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Preferences/TexShop comments.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Syntaxes/Bibtex.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Syntaxes/LaTeX Beamer.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Syntaxes/LaTeX Log.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Syntaxes/LaTeX Memoir.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Syntaxes/LaTeX.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/Syntaxes/TeX.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/latex/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/markdown_blogging/blogging.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/markdown_sublime/Markdown.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/markdown_sublime/MultiMarkdown.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/markdown_textmate/Preferences/Typing_pairs.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/markdown_textmate/Syntaxes/Markdown.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/markdown_textmate/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/perl/Preferences/Folding.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/perl/Preferences/Indentation.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/perl/Preferences/Miscellaneous.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/perl/Syntaxes/Perl 6.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/perl/Syntaxes/Perl.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/perl/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/php/Comments.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/php/Completion Rules.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/php/Indentation Rules Annex.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/php/Indentation Rules.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/php/PHP.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/php/Symbol List.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/php_vsc/language-configuration.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/php_vsc/package.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/php_vsc/package.nls.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/php_vsc/syntaxes/html.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/php_vsc/syntaxes/php.tmLanguage.json (100%) rename plugins/textmate/{ => tests}/testData/bundles/preferences_test/htmlOnly.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/preferences_test/phpOnly.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/preferences_test/sameScope1.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/preferences_test/sameScope2.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/python/Python.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/ruby/Syntaxes/HTML (Ruby - ERB).tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/ruby/Syntaxes/Ruby.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/ruby/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/shellscript/Syntaxes/Shell-Unix-Bash.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/bundles/shellscript/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/smarty/Preferences/Comments.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/smarty/Preferences/Folding.tmPreferences (100%) rename plugins/textmate/{ => tests}/testData/bundles/smarty/Syntaxes/Smarty.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/smarty/info.plist (100%) rename plugins/textmate/{ => tests}/testData/bundles/turtle/Turtle.tmLanguage (100%) rename plugins/textmate/{ => tests}/testData/editor/data/batLineCommenter.bat_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/batLineCommenter_after.bat_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/blockCommenter.php_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/blockCommenterInInjection.php_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/blockCommenterInInjection_2.php_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/blockCommenterInInjection_2_after.php_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/blockCommenterInInjection_after.php_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/blockCommenter_after.php_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/commenterInInjectedCode.php_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/commenterInInjectedCode_after.php_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/jsxBlockCommenter.jsx_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/jsxBlockCommenter_after.jsx_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/latexLineCommenter.tex (100%) rename plugins/textmate/{ => tests}/testData/editor/data/latexLineCommenter_after.tex (100%) rename plugins/textmate/{ => tests}/testData/editor/data/phpLineCommenter.php_hack (100%) rename plugins/textmate/{ => tests}/testData/editor/data/phpLineCommenter_after.php_hack (100%) rename plugins/textmate/{ => tests}/testData/lexer/astro/text.astro (100%) rename plugins/textmate/{ => tests}/testData/lexer/astro/text_after.astro (100%) rename plugins/textmate/{ => tests}/testData/lexer/bat/bat.bat_hack (100%) rename plugins/textmate/{ => tests}/testData/lexer/bat/bat_after.bat_hack (100%) rename plugins/textmate/{ => tests}/testData/lexer/coldfusion/coldfusion.cfm (100%) rename plugins/textmate/{ => tests}/testData/lexer/coldfusion/coldfusion_after.cfm (100%) rename plugins/textmate/{ => tests}/testData/lexer/cpp/test.cc (100%) rename plugins/textmate/{ => tests}/testData/lexer/cpp/test_after.cc (100%) rename plugins/textmate/{ => tests}/testData/lexer/docker_vsc/Dockerfile (100%) rename plugins/textmate/{ => tests}/testData/lexer/docker_vsc/Dockerfile_after (100%) rename plugins/textmate/{ => tests}/testData/lexer/elixir/simpleTest.ex (100%) rename plugins/textmate/{ => tests}/testData/lexer/elixir/simpleTest_after.ex (100%) rename plugins/textmate/{ => tests}/testData/lexer/fsharp/test.fs (100%) rename plugins/textmate/{ => tests}/testData/lexer/fsharp/test_after.fs (100%) rename plugins/textmate/{ => tests}/testData/lexer/git/COMMIT_EDITMSG (100%) rename plugins/textmate/{ => tests}/testData/lexer/git/COMMIT_EDITMSG_after (100%) rename plugins/textmate/{ => tests}/testData/lexer/go/test.go (100%) rename plugins/textmate/{ => tests}/testData/lexer/go/test_after.go (100%) rename plugins/textmate/{ => tests}/testData/lexer/html_vsc/doctype.html (100%) rename plugins/textmate/{ => tests}/testData/lexer/html_vsc/doctype_after.html (100%) rename plugins/textmate/{ => tests}/testData/lexer/html_vsc/html_css.html (100%) rename plugins/textmate/{ => tests}/testData/lexer/html_vsc/html_css_after.html (100%) rename plugins/textmate/{ => tests}/testData/lexer/java/java.java (100%) rename plugins/textmate/{ => tests}/testData/lexer/java/java_after.java (100%) rename plugins/textmate/{ => tests}/testData/lexer/java/java_unicode_literal.java (100%) rename plugins/textmate/{ => tests}/testData/lexer/java/java_unicode_literal_after.java (100%) rename plugins/textmate/{ => tests}/testData/lexer/latex/text.tex (100%) rename plugins/textmate/{ => tests}/testData/lexer/latex/text_after.tex (100%) rename plugins/textmate/{ => tests}/testData/lexer/log/log.log (100%) rename plugins/textmate/{ => tests}/testData/lexer/log/log_after.log (100%) rename plugins/textmate/{ => tests}/testData/lexer/make/test.mk (100%) rename plugins/textmate/{ => tests}/testData/lexer/make/test_after.mk (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/code.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/code_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/cyrillic.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/cyrillic_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/header_after_paragraph.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/header_after_paragraph_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/headers.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/headers_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/inline_bold.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/inline_bold_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/link.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/link_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/new_line_required_bug.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/new_line_required_bug_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/numbered_list.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/numbered_list_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/paragraph.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/paragraph_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/unknown_utf.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown/unknown_utf_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_blogging/ruby12703.blog.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_blogging/ruby12703.blog_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_blogging/ruby12703_after.blog.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_html/heading.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_html/heading_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_sublime/infinity_loop_bundle_bug.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_sublime/infinity_loop_bundle_bug_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_vsc/heading.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_vsc/heading_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_vsc/inline_bold.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_vsc/inline_bold_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_vsc/unknown_utf.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/markdown_vsc/unknown_utf_after.md (100%) rename plugins/textmate/{ => tests}/testData/lexer/perl/perl.pl (100%) rename plugins/textmate/{ => tests}/testData/lexer/perl/perl_after.pl (100%) rename plugins/textmate/{ => tests}/testData/lexer/perl/regex.pl (100%) rename plugins/textmate/{ => tests}/testData/lexer/perl/regex_after.pl (100%) rename plugins/textmate/{ => tests}/testData/lexer/php/injection.php_hack (100%) rename plugins/textmate/{ => tests}/testData/lexer/php/injection_after.php_hack (100%) rename plugins/textmate/{ => tests}/testData/lexer/php_html/php_html.php (100%) rename plugins/textmate/{ => tests}/testData/lexer/php_vsc/empty.php_vsc (100%) rename plugins/textmate/{ => tests}/testData/lexer/php_vsc/empty_after.php_vsc (100%) rename plugins/textmate/{ => tests}/testData/lexer/php_vsc/escape_symbol.php_vsc (100%) rename plugins/textmate/{ => tests}/testData/lexer/php_vsc/escape_symbol_after.php_vsc (100%) rename plugins/textmate/{ => tests}/testData/lexer/php_vsc/html_css.php_vsc (100%) rename plugins/textmate/{ => tests}/testData/lexer/php_vsc/html_css_after.php_vsc (100%) rename plugins/textmate/{ => tests}/testData/lexer/php_vsc/slow.php_vsc (100%) rename plugins/textmate/{ => tests}/testData/lexer/php_vsc/slow_after.php_vsc (100%) rename plugins/textmate/{ => tests}/testData/lexer/python/dictionary.py (100%) rename plugins/textmate/{ => tests}/testData/lexer/python/dictionary_after.py (100%) rename plugins/textmate/{ => tests}/testData/lexer/python/selfpointer.py (100%) rename plugins/textmate/{ => tests}/testData/lexer/python/selfpointer_after.py (100%) rename plugins/textmate/{ => tests}/testData/lexer/rst/nested.rst (100%) rename plugins/textmate/{ => tests}/testData/lexer/rst/nested_after.rst (100%) rename plugins/textmate/{ => tests}/testData/lexer/ruby/comment_at_line_start.rb (100%) rename plugins/textmate/{ => tests}/testData/lexer/ruby/comment_at_line_start_after.rb (100%) rename plugins/textmate/{ => tests}/testData/lexer/shellscript/case.sh (100%) rename plugins/textmate/{ => tests}/testData/lexer/shellscript/case_after.sh (100%) rename plugins/textmate/{ => tests}/testData/lexer/shellscript/comment.sh (100%) rename plugins/textmate/{ => tests}/testData/lexer/shellscript/comment_after.sh (100%) rename plugins/textmate/{ => tests}/testData/lexer/shellscript/heredoc.sh (100%) rename plugins/textmate/{ => tests}/testData/lexer/shellscript/heredoc_after.sh (100%) rename plugins/textmate/{ => tests}/testData/lexer/smarty/injection.tpl_hack (100%) rename plugins/textmate/{ => tests}/testData/lexer/smarty/injection_after.tpl_hack (100%) rename plugins/textmate/{ => tests}/testData/lexer/terraform/module.tf (100%) rename plugins/textmate/{ => tests}/testData/lexer/terraform/module_after.tf (100%) rename plugins/textmate/{ => tests}/testData/lexer/terraform/split_scope_by_space.tf (100%) rename plugins/textmate/{ => tests}/testData/lexer/terraform/split_scope_by_space_after.tf (100%) rename plugins/textmate/{ => tests}/testData/lexer/turtle/local_inifinity_loop_protection.ttl (100%) rename plugins/textmate/{ => tests}/testData/lexer/turtle/local_inifinity_loop_protection_after.ttl (100%) rename plugins/textmate/{joni => tests}/tests/com/intellij/textmate/joni/JoniRegexFacadeTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/TestUtil.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/TextMateAcceptanceTestCase.java (97%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/bundles/BundleTypeTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/editor/TextMateBraceMatcherTest.java (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/editor/TextMateCommenterTest.java (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/editor/TextMateCompletionTest.java (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/editor/TextMateSnippetsCompletionTest.java (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/editor/TextMateTypedHandlerTest.java (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/language/preferences/PreferencesTest.kt (98%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/language/preferences/ShellVariablesTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/language/preferences/TextMateSnippetsLoadingTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerPerformanceTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerTestCase.kt (98%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/AstroLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/BatLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/ColdFusionLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/CppLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/DockerLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/ElixirLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/FSharpLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/GitLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/GoLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/HtmlVscLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/JavaLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/LatexLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/LogLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/MakefileLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownBloggingLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownHtmlLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownSublimeLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownVscLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/PerlLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpHtmlLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpVscLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/PythonLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/RstLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/RubyLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/ShellscriptLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/SmartyPhpLexerTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtilsTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/TerraformLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/lexer/TurtleLexerTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/regex/CachingRegexFacadeTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/regex/CaffeineCachingRegexFacadeTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/regex/RememberLastMatchRegexFacadeTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCachingSelectorWeigherTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCaffeineSelectorWeigherTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherImplTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherTestCase.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/plist/JsonOrXmlPlistReaderTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/plist/JsonPlistReaderTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/plist/XmlPlistReaderTest.kt (100%) rename plugins/textmate/{core => tests}/tests/org/jetbrains/plugins/textmate/regex/RegexFacadeTest.kt (100%) rename plugins/textmate/tests/{ => tests}/org/jetbrains/plugins/textmate/spellchecker/TextMateSpellcheckingTest.java (100%) rename plugins/textmate/{core => tests}/testsMultiplatform/org/jetbrains/plugins/textmate/TestUtilMultiplatform.kt (94%) rename plugins/textmate/{core => tests}/testsMultiplatform/org/jetbrains/plugins/textmate/plist/XmlPlistReaderForTests.kt (100%) diff --git a/.idea/modules.xml b/.idea/modules.xml index f5f31cdaf9e3..80f58fedef42 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1162,8 +1162,12 @@ + + + + diff --git a/BUILD.bazel b/BUILD.bazel index 49eecddcc065..696112452b10 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -293,8 +293,7 @@ jvm_library( "//plugins/testng_rt/tests:tests_test_lib", "//platform/workspace/storage/tests:tests_test_lib", "//platform/workspace/jps/tests:tests_test_lib", - "//plugins/textmate", - "//plugins/textmate:textmate_test_lib", + "//plugins/textmate/plugin", "//plugins/space/jps-plugin:java-jps", "//build/tasks", "//build/tasks:tasks_test_lib", @@ -360,6 +359,7 @@ jvm_library( "//python/python-pyproject:pyproject_test_lib", "//platform/indexing-tests:indexing-tests_test_lib", "//platform/testFramework/monorepo:monorepo_test_lib", + "//plugins/textmate/tests:tests_test_lib", ], runtime_deps = [ "//platform/main/intellij.platform.monolith.main:monolith-main", diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 6ce55c0bf1a5..23c32de1b732 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -1249,8 +1249,12 @@ plugins/testng plugins/testng_rt plugins/testng_rt/tests plugins/textmate +plugins/textmate/backend +plugins/textmate/common plugins/textmate/core plugins/textmate/joni +plugins/textmate/plugin +plugins/textmate/tests plugins/toml plugins/toml/backend plugins/toml/core diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index c8d43423bc9c..12e155c93cdc 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -149,7 +149,7 @@ - + @@ -255,5 +255,6 @@ + \ No newline at end of file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt index 4f51ff6f08d2..2c72beb76955 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt @@ -20,7 +20,7 @@ val IDEA_BUNDLED_PLUGINS: PersistentList = DEFAULT_BUNDLED_PLUGINS + seq "intellij.copyright", "intellij.properties", "intellij.terminal", - "intellij.textmate", + "intellij.textmate.plugin", "intellij.editorconfig.plugin", "intellij.configurationScript", "intellij.json", diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt index e9e836dfde8e..0a4c15e5ba31 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt @@ -186,8 +186,8 @@ object CommunityRepositoryModules { spec.withModule("intellij.terminal.completion") spec.withResource("resources/shell-integrations", "shell-integrations") }, - pluginAuto(listOf("intellij.textmate")) { spec -> - spec.withResource("lib/bundles", "lib/bundles") + pluginAuto(listOf("intellij.textmate.plugin")) { spec -> + spec.withResourceFromModule("intellij.textmate", "lib/bundles", "lib/bundles") }, PythonCommunityPluginModules.pythonCommunityPluginLayout(), androidDesignPlugin(), diff --git a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginGraphWriter.kt b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginGraphWriter.kt index 331c442dccd6..fbca0fec7549 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginGraphWriter.kt +++ b/platform/platform-tests/testSrc/com/intellij/ide/plugins/PluginGraphWriter.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.plugins import com.fasterxml.jackson.core.JsonFactory @@ -10,7 +10,6 @@ import com.intellij.util.io.jackson.array import com.intellij.util.io.jackson.obj import it.unimi.dsi.fastutil.bytes.ByteArrays import it.unimi.dsi.fastutil.objects.Object2IntOpenCustomHashMap -import java.io.File import java.io.StringWriter import java.io.Writer import java.nio.file.Files diff --git a/plugins/textmate/BUILD.bazel b/plugins/textmate/BUILD.bazel index 2946959b357d..4e538b30a1dd 100644 --- a/plugins/textmate/BUILD.bazel +++ b/plugins/textmate/BUILD.bazel @@ -39,53 +39,4 @@ jvm_library( ], runtime_deps = [":textmate_resources"] ) - -jvm_library( - name = "textmate_test_lib", - visibility = ["//visibility:public"], - srcs = glob(["tests/**/*.kt", "tests/**/*.java"], allow_empty = True), - associates = [":textmate"], - deps = [ - "//platform/analysis-api:analysis", - "//platform/code-style-api:codeStyle", - "//platform/core-api:core", - "//platform/editor-ui-api:editor-ui", - "//platform/lang-impl", - "//platform/ide-core-impl", - "//platform/projectModel-api:projectModel", - "//platform/testFramework", - "//platform/testFramework:testFramework_test_lib", - "//spellchecker", - "//spellchecker:spellchecker_test_lib", - "//platform/diff-api:diff", - "//plugins/textmate/core", - "//plugins/textmate/core:core_test_lib", - "//platform/indexing-impl", - "//platform/core-ui", - "//platform/editor-ui-ex:editor-ex", - "@lib//:jackson", - "@lib//:jackson-databind", - "//platform/platform-impl:ide-impl", - "@lib//:kotlinx-serialization-core", - "//platform/code-style-impl:codeStyle-impl", - "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", - "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", - "@lib//:caffeine", - "//fleet/fastutil", - "@lib//:fastutil-min", - "//plugins/textmate/joni", - "//plugins/textmate/joni:joni_test_lib", - "//platform/util/xmlDom", - ], - runtime_deps = [":textmate_resources"] -) -### auto-generated section `build intellij.textmate` end - -### auto-generated section `test intellij.textmate` start -load("@community//build:tests-options.bzl", "jps_test") - -jps_test( - name = "textmate_test", - runtime_deps = [":textmate_test_lib"] -) -### auto-generated section `test intellij.textmate` end \ No newline at end of file +### auto-generated section `build intellij.textmate` end \ No newline at end of file diff --git a/plugins/textmate/backend/BUILD.bazel b/plugins/textmate/backend/BUILD.bazel new file mode 100644 index 000000000000..ec36d9a5efe2 --- /dev/null +++ b/plugins/textmate/backend/BUILD.bazel @@ -0,0 +1,16 @@ +### auto-generated section `build intellij.textmate.backend` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "backend_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "backend", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + runtime_deps = [":backend_resources"] +) +### auto-generated section `build intellij.textmate.backend` end \ No newline at end of file diff --git a/plugins/textmate/backend/intellij.textmate.backend.iml b/plugins/textmate/backend/intellij.textmate.backend.iml new file mode 100644 index 000000000000..510e3ffb6679 --- /dev/null +++ b/plugins/textmate/backend/intellij.textmate.backend.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/textmate/backend/resources/intellij.textmate.backend.xml b/plugins/textmate/backend/resources/intellij.textmate.backend.xml new file mode 100644 index 000000000000..a26656dc81d4 --- /dev/null +++ b/plugins/textmate/backend/resources/intellij.textmate.backend.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/plugins/textmate/common/BUILD.bazel b/plugins/textmate/common/BUILD.bazel new file mode 100644 index 000000000000..6de5764b94bf --- /dev/null +++ b/plugins/textmate/common/BUILD.bazel @@ -0,0 +1,16 @@ +### auto-generated section `build intellij.textmate.common` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "common_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "common", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + runtime_deps = [":common_resources"] +) +### auto-generated section `build intellij.textmate.common` end \ No newline at end of file diff --git a/plugins/textmate/common/intellij.textmate.common.iml b/plugins/textmate/common/intellij.textmate.common.iml new file mode 100644 index 000000000000..510e3ffb6679 --- /dev/null +++ b/plugins/textmate/common/intellij.textmate.common.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/textmate/common/resources/intellij.textmate.common.xml b/plugins/textmate/common/resources/intellij.textmate.common.xml new file mode 100644 index 000000000000..0b843f9a636f --- /dev/null +++ b/plugins/textmate/common/resources/intellij.textmate.common.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/textmate/core/BUILD.bazel b/plugins/textmate/core/BUILD.bazel index e2e1b55062ab..5a4ff39e8bb9 100644 --- a/plugins/textmate/core/BUILD.bazel +++ b/plugins/textmate/core/BUILD.bazel @@ -1,12 +1,18 @@ ### auto-generated section `build intellij.textmate.core` start load("//build:compiler-options.bzl", "create_kotlinc_options") -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") create_kotlinc_options( name = "custom_core", opt_in = ["kotlin.concurrent.atomics.ExperimentalAtomicApi"] ) +jvm_resources( + name = "core_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + jvm_library( name = "core", module_name = "intellij.textmate.core", @@ -19,42 +25,13 @@ jvm_library( "@lib//:kotlinx-serialization-json", "@lib//:kotlin-stdlib", "@lib//:kotlin-reflect", - "@lib//:kotlinx-coroutines-core", "@lib//:slf4j-api", - "@lib//:kotlinx-collections-immutable", + "@lib//:kotlinx-coroutines-core-provided", + "@lib//:kotlinx-collections-immutable-provided", ], - runtime_deps = ["//platform/backend"] -) - -jvm_library( - name = "core_test_lib", - visibility = ["//visibility:public"], - srcs = glob(["tests/**/*.kt", "tests/**/*.java", "testsMultiplatform/**/*.kt", "testsMultiplatform/**/*.java"], allow_empty = True), - kotlinc_opts = ":custom_core", - associates = [":core"], - deps = [ - "@lib//:jetbrains-annotations", - "@lib//:kotlinx-serialization-core", - "@lib//:kotlinx-serialization-json", - "@lib//:kotlin-stdlib", - "@lib//:kotlin-reflect", - "@lib//:kotlinx-coroutines-core", - "@lib//:slf4j-api", - "@lib//:kotlinx-collections-immutable", - "@lib//:kotlin-test", - "//platform/util", - "@lib//:junit5", - "//platform/util/xmlDom", - "@lib//:kotlinx-coroutines-test", + runtime_deps = [ + ":core_resources", + "//platform/backend", ] ) -### auto-generated section `build intellij.textmate.core` end - -### auto-generated section `test intellij.textmate.core` start -load("@community//build:tests-options.bzl", "jps_test") - -jps_test( - name = "core_test", - runtime_deps = [":core_test_lib"] -) -### auto-generated section `test intellij.textmate.core` end \ No newline at end of file +### auto-generated section `build intellij.textmate.core` end \ No newline at end of file diff --git a/plugins/textmate/core/intellij.textmate.core.iml b/plugins/textmate/core/intellij.textmate.core.iml index ece478ca9dd4..d47dea347348 100644 --- a/plugins/textmate/core/intellij.textmate.core.iml +++ b/plugins/textmate/core/intellij.textmate.core.iml @@ -26,10 +26,9 @@ - - + @@ -38,14 +37,9 @@ - - - - - - - + + \ No newline at end of file diff --git a/plugins/textmate/core/resources/intellij.textmate.core.xml b/plugins/textmate/core/resources/intellij.textmate.core.xml new file mode 100644 index 000000000000..164f46cfcfb2 --- /dev/null +++ b/plugins/textmate/core/resources/intellij.textmate.core.xml @@ -0,0 +1,2 @@ + + diff --git a/plugins/textmate/core/src/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtils.kt b/plugins/textmate/core/src/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtils.kt index 749d511f11ed..d078b43ef713 100644 --- a/plugins/textmate/core/src/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtils.kt +++ b/plugins/textmate/core/src/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtils.kt @@ -3,7 +3,7 @@ package org.jetbrains.plugins.textmate.language.syntax.lexer import org.jetbrains.plugins.textmate.regex.MatchData import org.jetbrains.plugins.textmate.regex.TextMateString -internal object SyntaxMatchUtils { +object SyntaxMatchUtils { /** * Replaces parts like \1 or \20 in string parameter with group captures from matchData. diff --git a/plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/RegexUtil.kt b/plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/RegexUtil.kt index 7bb8b54505d8..7e7feaa5bbe3 100644 --- a/plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/RegexUtil.kt +++ b/plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/RegexUtil.kt @@ -3,7 +3,7 @@ package org.jetbrains.plugins.textmate.regex import kotlin.Char.Companion.MIN_HIGH_SURROGATE import kotlin.Char.Companion.MIN_LOW_SURROGATE -internal fun byteOffsetByCharOffset( +fun byteOffsetByCharOffset( charSequence: CharSequence, startOffset: TextMateCharOffset, targetOffset: TextMateCharOffset, diff --git a/plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/TextMateRange.kt b/plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/TextMateRange.kt index 04641d88c242..58a413308e67 100644 --- a/plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/TextMateRange.kt +++ b/plugins/textmate/core/src/org/jetbrains/plugins/textmate/regex/TextMateRange.kt @@ -1,7 +1,5 @@ package org.jetbrains.plugins.textmate.regex -import kotlin.jvm.JvmInline - @JvmInline value class TextMateCharOffset(val offset: Int): Comparable { operator fun plus(other: TextMateCharOffset): TextMateCharOffset { @@ -28,13 +26,13 @@ value class TextMateByteOffset(val offset: Int): Comparable } } -internal fun Int.byteOffset(): TextMateByteOffset = TextMateByteOffset(this) -internal fun Int.charOffset(): TextMateCharOffset = TextMateCharOffset(this) +fun Int.byteOffset(): TextMateByteOffset = TextMateByteOffset(this) +fun Int.charOffset(): TextMateCharOffset = TextMateCharOffset(this) -internal operator fun CharSequence.get(offset: TextMateCharOffset): Char = get(offset.offset) -internal fun CharSequence.subSequence(start: TextMateCharOffset, end: TextMateCharOffset): CharSequence = subSequence(start.offset, end.offset) -internal fun CharSequence.subSequence(range: TextMateCharRange): CharSequence = subSequence(range.start.offset, range.end.offset) -internal fun CharSequence.indexOf(char: Char, startIndex: TextMateCharOffset): TextMateCharOffset { +operator fun CharSequence.get(offset: TextMateCharOffset): Char = get(offset.offset) +fun CharSequence.subSequence(start: TextMateCharOffset, end: TextMateCharOffset): CharSequence = subSequence(start.offset, end.offset) +fun CharSequence.subSequence(range: TextMateCharRange): CharSequence = subSequence(range.start.offset, range.end.offset) +fun CharSequence.indexOf(char: Char, startIndex: TextMateCharOffset): TextMateCharOffset { return indexOf(char, startIndex = startIndex.offset).charOffset() } diff --git a/plugins/textmate/core/srcMultiplatform/org/jetbrains/plugins/textmate/Multiplatform.kt b/plugins/textmate/core/srcMultiplatform/org/jetbrains/plugins/textmate/Multiplatform.kt index 883f8493d642..1428ddf3d12e 100644 --- a/plugins/textmate/core/srcMultiplatform/org/jetbrains/plugins/textmate/Multiplatform.kt +++ b/plugins/textmate/core/srcMultiplatform/org/jetbrains/plugins/textmate/Multiplatform.kt @@ -21,7 +21,7 @@ import kotlin.reflect.KClass * and every target should provide its own implementation. */ -internal fun AtomicReference.update(f: (T) -> T) { +fun AtomicReference.update(f: (T) -> T) { updateAndGet(f) } diff --git a/plugins/textmate/intellij.textmate.iml b/plugins/textmate/intellij.textmate.iml index 5af0d2974b53..4671ec834edc 100644 --- a/plugins/textmate/intellij.textmate.iml +++ b/plugins/textmate/intellij.textmate.iml @@ -26,7 +26,6 @@ - @@ -38,7 +37,6 @@ - @@ -50,7 +48,6 @@ - diff --git a/plugins/textmate/joni/BUILD.bazel b/plugins/textmate/joni/BUILD.bazel index 68c7838b30c2..29d96f77b686 100644 --- a/plugins/textmate/joni/BUILD.bazel +++ b/plugins/textmate/joni/BUILD.bazel @@ -1,5 +1,11 @@ ### auto-generated section `build intellij.textmate.joni` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "joni_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "joni", @@ -11,30 +17,7 @@ jvm_library( "//plugins/textmate/core", "@lib//:joni", "@lib//:slf4j-api", - ] + ], + runtime_deps = [":joni_resources"] ) - -jvm_library( - name = "joni_test_lib", - visibility = ["//visibility:public"], - srcs = glob(["tests/**/*.kt", "tests/**/*.java"], allow_empty = True), - associates = [":joni"], - deps = [ - "@lib//:kotlin-stdlib", - "//plugins/textmate/core", - "//plugins/textmate/core:core_test_lib", - "@lib//:joni", - "@lib//:slf4j-api", - "@lib//:junit5", - ] -) -### auto-generated section `build intellij.textmate.joni` end - -### auto-generated section `test intellij.textmate.joni` start -load("@community//build:tests-options.bzl", "jps_test") - -jps_test( - name = "joni_test", - runtime_deps = [":joni_test_lib"] -) -### auto-generated section `test intellij.textmate.joni` end \ No newline at end of file +### auto-generated section `build intellij.textmate.joni` end \ No newline at end of file diff --git a/plugins/textmate/joni/intellij.textmate.joni.iml b/plugins/textmate/joni/intellij.textmate.joni.iml index 9026b197751e..794d8e9db032 100644 --- a/plugins/textmate/joni/intellij.textmate.joni.iml +++ b/plugins/textmate/joni/intellij.textmate.joni.iml @@ -4,7 +4,7 @@ - + @@ -12,6 +12,5 @@ - \ No newline at end of file diff --git a/plugins/textmate/joni/resources/intellij.textmate.joni.xml b/plugins/textmate/joni/resources/intellij.textmate.joni.xml new file mode 100644 index 000000000000..619372110766 --- /dev/null +++ b/plugins/textmate/joni/resources/intellij.textmate.joni.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/plugins/textmate/plugin-content.yaml b/plugins/textmate/plugin-content.yaml deleted file mode 100644 index 9ad70395bc45..000000000000 --- a/plugins/textmate/plugin-content.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- name: lib/joni.jar - library: joni - files: - - name: $MAVEN_REPOSITORY$/org/jruby/joni/joni/2/joni-2.jar - - name: $MAVEN_REPOSITORY$/org/jruby/jcodings/jcodings/1/jcodings-1.jar - reason: <- intellij.textmate.joni -- name: lib/textmate.jar - modules: - - name: intellij.textmate - - name: intellij.textmate.core - reason: <- intellij.textmate - - name: intellij.textmate.joni - reason: <- intellij.textmate \ No newline at end of file diff --git a/plugins/textmate/plugin/BUILD.bazel b/plugins/textmate/plugin/BUILD.bazel new file mode 100644 index 000000000000..4ce4dfb7ab14 --- /dev/null +++ b/plugins/textmate/plugin/BUILD.bazel @@ -0,0 +1,16 @@ +### auto-generated section `build intellij.textmate.plugin` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "plugin_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "plugin", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + runtime_deps = [":plugin_resources"] +) +### auto-generated section `build intellij.textmate.plugin` end \ No newline at end of file diff --git a/plugins/textmate/plugin/intellij.textmate.plugin.iml b/plugins/textmate/plugin/intellij.textmate.plugin.iml new file mode 100644 index 000000000000..510e3ffb6679 --- /dev/null +++ b/plugins/textmate/plugin/intellij.textmate.plugin.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/textmate/plugin/plugin-content.yaml b/plugins/textmate/plugin/plugin-content.yaml new file mode 100644 index 000000000000..a39ca7ae0a80 --- /dev/null +++ b/plugins/textmate/plugin/plugin-content.yaml @@ -0,0 +1,26 @@ +- name: lib/modules/intellij.textmate.backend.jar + contentModules: + - name: intellij.textmate.backend +- name: lib/modules/intellij.textmate.common.jar + contentModules: + - name: intellij.textmate.common +- name: lib/modules/intellij.textmate.core.jar + contentModules: + - name: intellij.textmate.core +- name: lib/modules/intellij.textmate.frontend.split.jar + contentModules: + - name: intellij.textmate.frontend.split +- name: lib/modules/intellij.textmate.jar + contentModules: + - name: intellij.textmate +- name: lib/modules/intellij.textmate.joni.jar + contentModules: + - name: intellij.textmate.joni + library: joni + files: + - name: $MAVEN_REPOSITORY$/org/jruby/joni/joni/2/joni-2.jar + - name: $MAVEN_REPOSITORY$/org/jruby/jcodings/jcodings/1/jcodings-1.jar + reason: <- intellij.textmate.joni +- name: lib/textmate-plugin.jar + modules: + - name: intellij.textmate.plugin \ No newline at end of file diff --git a/plugins/textmate/plugin/resources/META-INF/plugin.xml b/plugins/textmate/plugin/resources/META-INF/plugin.xml new file mode 100644 index 000000000000..40f6e509fcfe --- /dev/null +++ b/plugins/textmate/plugin/resources/META-INF/plugin.xml @@ -0,0 +1,26 @@ + + org.jetbrains.plugins.textmate + TextMate Bundles + Languages + JetBrains + + TextMate bundles + ]]> + + + + + + + + + + + + + + + + diff --git a/plugins/textmate/resources/META-INF/plugin.xml b/plugins/textmate/resources/intellij.textmate.xml similarity index 89% rename from plugins/textmate/resources/META-INF/plugin.xml rename to plugins/textmate/resources/intellij.textmate.xml index c3d673f458a6..2a5431dbbd92 100644 --- a/plugins/textmate/resources/META-INF/plugin.xml +++ b/plugins/textmate/resources/intellij.textmate.xml @@ -1,17 +1,9 @@ - - org.jetbrains.plugins.textmate - TextMate Bundles - Languages - JetBrains - - TextMate bundles - ]]> - - com.intellij.modules.lang - com.intellij.modules.spellchecker - + + + + + + diff --git a/plugins/textmate/tests/BUILD.bazel b/plugins/textmate/tests/BUILD.bazel new file mode 100644 index 000000000000..6991ab66088c --- /dev/null +++ b/plugins/textmate/tests/BUILD.bazel @@ -0,0 +1,58 @@ +### auto-generated section `build intellij.textmate.tests` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "tests_test_resources", + files = glob(["testData/**/*"]), + strip_prefix = "testData" +) + +jvm_library( + name = "tests", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True) +) + +jvm_library( + name = "tests_test_lib", + module_name = "intellij.textmate.tests", + visibility = ["//visibility:public"], + srcs = glob(["tests/**/*.kt", "tests/**/*.java", "testsMultiplatform/**/*.kt", "testsMultiplatform/**/*.java"], allow_empty = True), + deps = [ + "@lib//:kotlin-stdlib", + "@lib//:jetbrains-annotations", + "//plugins/textmate/core", + "//plugins/textmate/joni", + "//platform/testFramework", + "//platform/testFramework:testFramework_test_lib", + "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", + "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", + "@lib//:junit5", + "@lib//:kotlin-test", + "@lib//:kotlinx-coroutines-test", + "//platform/util", + "//platform/util/xmlDom", + "@lib//:kotlinx-collections-immutable", + "@lib//:kotlinx-coroutines-core", + "//plugins/textmate", + "//platform/core-api:core", + "//platform/lang-impl", + "//platform/analysis-api:analysis", + "//platform/editor-ui-api:editor-ui", + "//spellchecker", + "//spellchecker:spellchecker_test_lib", + "//platform/projectModel-api:projectModel", + "//plugins/textmate/plugin", + ], + runtime_deps = [":tests_test_resources"] +) +### auto-generated section `build intellij.textmate.tests` end + +### auto-generated section `test intellij.textmate.tests` start +load("@community//build:tests-options.bzl", "jps_test") + +jps_test( + name = "tests_test", + runtime_deps = [":tests_test_lib"] +) +### auto-generated section `test intellij.textmate.tests` end \ No newline at end of file diff --git a/plugins/textmate/tests/intellij.textmate.tests.iml b/plugins/textmate/tests/intellij.textmate.tests.iml new file mode 100644 index 000000000000..420db9fbff8f --- /dev/null +++ b/plugins/textmate/tests/intellij.textmate.tests.iml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/textmate/testData/bundles/astro/languages/astro-language-configuration.json b/plugins/textmate/tests/testData/bundles/astro/languages/astro-language-configuration.json similarity index 100% rename from plugins/textmate/testData/bundles/astro/languages/astro-language-configuration.json rename to plugins/textmate/tests/testData/bundles/astro/languages/astro-language-configuration.json diff --git a/plugins/textmate/testData/bundles/astro/languages/astro.code-snippets b/plugins/textmate/tests/testData/bundles/astro/languages/astro.code-snippets similarity index 100% rename from plugins/textmate/testData/bundles/astro/languages/astro.code-snippets rename to plugins/textmate/tests/testData/bundles/astro/languages/astro.code-snippets diff --git a/plugins/textmate/testData/bundles/astro/package.json b/plugins/textmate/tests/testData/bundles/astro/package.json similarity index 100% rename from plugins/textmate/testData/bundles/astro/package.json rename to plugins/textmate/tests/testData/bundles/astro/package.json diff --git a/plugins/textmate/testData/bundles/astro/syntaxes/astro.tmLanguage-1.json b/plugins/textmate/tests/testData/bundles/astro/syntaxes/astro.tmLanguage-1.json similarity index 100% rename from plugins/textmate/testData/bundles/astro/syntaxes/astro.tmLanguage-1.json rename to plugins/textmate/tests/testData/bundles/astro/syntaxes/astro.tmLanguage-1.json diff --git a/plugins/textmate/testData/bundles/astro/syntaxes/astro.tmLanguage.json b/plugins/textmate/tests/testData/bundles/astro/syntaxes/astro.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/astro/syntaxes/astro.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/astro/syntaxes/astro.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/astro/syntaxes/markdown.astro.tmLanguage.json b/plugins/textmate/tests/testData/bundles/astro/syntaxes/markdown.astro.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/astro/syntaxes/markdown.astro.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/astro/syntaxes/markdown.astro.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/astro/syntaxes/mdx.astro.tmLanguage.json b/plugins/textmate/tests/testData/bundles/astro/syntaxes/mdx.astro.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/astro/syntaxes/mdx.astro.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/astro/syntaxes/mdx.astro.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/bat/.vscodeignore b/plugins/textmate/tests/testData/bundles/bat/.vscodeignore similarity index 100% rename from plugins/textmate/testData/bundles/bat/.vscodeignore rename to plugins/textmate/tests/testData/bundles/bat/.vscodeignore diff --git a/plugins/textmate/testData/bundles/bat/cgmanifest.json b/plugins/textmate/tests/testData/bundles/bat/cgmanifest.json similarity index 100% rename from plugins/textmate/testData/bundles/bat/cgmanifest.json rename to plugins/textmate/tests/testData/bundles/bat/cgmanifest.json diff --git a/plugins/textmate/testData/bundles/bat/language-configuration.json b/plugins/textmate/tests/testData/bundles/bat/language-configuration.json similarity index 100% rename from plugins/textmate/testData/bundles/bat/language-configuration.json rename to plugins/textmate/tests/testData/bundles/bat/language-configuration.json diff --git a/plugins/textmate/testData/bundles/bat/package.json b/plugins/textmate/tests/testData/bundles/bat/package.json similarity index 100% rename from plugins/textmate/testData/bundles/bat/package.json rename to plugins/textmate/tests/testData/bundles/bat/package.json diff --git a/plugins/textmate/testData/bundles/bat/package.nls.json b/plugins/textmate/tests/testData/bundles/bat/package.nls.json similarity index 100% rename from plugins/textmate/testData/bundles/bat/package.nls.json rename to plugins/textmate/tests/testData/bundles/bat/package.nls.json diff --git a/plugins/textmate/testData/bundles/bat/snippets/batchfile.snippets.json b/plugins/textmate/tests/testData/bundles/bat/snippets/batchfile.snippets.json similarity index 100% rename from plugins/textmate/testData/bundles/bat/snippets/batchfile.snippets.json rename to plugins/textmate/tests/testData/bundles/bat/snippets/batchfile.snippets.json diff --git a/plugins/textmate/testData/bundles/bat/syntaxes/batchfile.tmLanguage.json b/plugins/textmate/tests/testData/bundles/bat/syntaxes/batchfile.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/bat/syntaxes/batchfile.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/bat/syntaxes/batchfile.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/bat/test/colorize-fixtures/test.bat b/plugins/textmate/tests/testData/bundles/bat/test/colorize-fixtures/test.bat similarity index 100% rename from plugins/textmate/testData/bundles/bat/test/colorize-fixtures/test.bat rename to plugins/textmate/tests/testData/bundles/bat/test/colorize-fixtures/test.bat diff --git a/plugins/textmate/testData/bundles/bat/test/colorize-results/test_bat.json b/plugins/textmate/tests/testData/bundles/bat/test/colorize-results/test_bat.json similarity index 100% rename from plugins/textmate/testData/bundles/bat/test/colorize-results/test_bat.json rename to plugins/textmate/tests/testData/bundles/bat/test/colorize-results/test_bat.json diff --git a/plugins/textmate/testData/bundles/chef/Snippets/chef_log.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/chef_log.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/chef_log.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/chef_log.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/cookbook_file.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/cookbook_file.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/cookbook_file.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/cookbook_file.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/cron.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/cron.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/cron.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/cron.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/directory.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/directory.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/directory.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/directory.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/execute.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/execute.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/execute.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/execute.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/file.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/file.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/file.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/file.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/gem_package.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/gem_package.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/gem_package.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/gem_package.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/group.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/group.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/group.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/group.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/http_request.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/http_request.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/http_request.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/http_request.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/link.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/link.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/link.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/link.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/package.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/package.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/package.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/package.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/remote.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/remote.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/remote.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/remote.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/ruby_block.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/ruby_block.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/ruby_block.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/ruby_block.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/script.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/script.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/script.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/script.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/service.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/service.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/service.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/service.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/system_user.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/system_user.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/system_user.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/system_user.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/template.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/template.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/template.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/template.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Snippets/user.tmSnippet b/plugins/textmate/tests/testData/bundles/chef/Snippets/user.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/chef/Snippets/user.tmSnippet rename to plugins/textmate/tests/testData/bundles/chef/Snippets/user.tmSnippet diff --git a/plugins/textmate/testData/bundles/chef/Syntaxes/Chef.tmLanguage b/plugins/textmate/tests/testData/bundles/chef/Syntaxes/Chef.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/chef/Syntaxes/Chef.tmLanguage rename to plugins/textmate/tests/testData/bundles/chef/Syntaxes/Chef.tmLanguage diff --git a/plugins/textmate/testData/bundles/chef/info.plist b/plugins/textmate/tests/testData/bundles/chef/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/chef/info.plist rename to plugins/textmate/tests/testData/bundles/chef/info.plist diff --git a/plugins/textmate/testData/bundles/coldfusion/Syntaxes/ColdFusion.tmLanguage b/plugins/textmate/tests/testData/bundles/coldfusion/Syntaxes/ColdFusion.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/coldfusion/Syntaxes/ColdFusion.tmLanguage rename to plugins/textmate/tests/testData/bundles/coldfusion/Syntaxes/ColdFusion.tmLanguage diff --git a/plugins/textmate/testData/bundles/coldfusion/info.plist b/plugins/textmate/tests/testData/bundles/coldfusion/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/coldfusion/info.plist rename to plugins/textmate/tests/testData/bundles/coldfusion/info.plist diff --git a/plugins/textmate/testData/bundles/css_vsc/package.json b/plugins/textmate/tests/testData/bundles/css_vsc/package.json similarity index 100% rename from plugins/textmate/testData/bundles/css_vsc/package.json rename to plugins/textmate/tests/testData/bundles/css_vsc/package.json diff --git a/plugins/textmate/testData/bundles/css_vsc/syntaxes/css.tmLanguage.json b/plugins/textmate/tests/testData/bundles/css_vsc/syntaxes/css.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/css_vsc/syntaxes/css.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/css_vsc/syntaxes/css.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/elixir/Preferences/Comments.tmPreferences b/plugins/textmate/tests/testData/bundles/elixir/Preferences/Comments.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/elixir/Preferences/Comments.tmPreferences rename to plugins/textmate/tests/testData/bundles/elixir/Preferences/Comments.tmPreferences diff --git a/plugins/textmate/testData/bundles/elixir/Preferences/Indent.tmPreferences b/plugins/textmate/tests/testData/bundles/elixir/Preferences/Indent.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/elixir/Preferences/Indent.tmPreferences rename to plugins/textmate/tests/testData/bundles/elixir/Preferences/Indent.tmPreferences diff --git a/plugins/textmate/testData/bundles/elixir/Preferences/Typing Pairs.tmPreferences b/plugins/textmate/tests/testData/bundles/elixir/Preferences/Typing Pairs.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/elixir/Preferences/Typing Pairs.tmPreferences rename to plugins/textmate/tests/testData/bundles/elixir/Preferences/Typing Pairs.tmPreferences diff --git a/plugins/textmate/testData/bundles/elixir/Syntaxes/EEx.tmLanguage b/plugins/textmate/tests/testData/bundles/elixir/Syntaxes/EEx.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/elixir/Syntaxes/EEx.tmLanguage rename to plugins/textmate/tests/testData/bundles/elixir/Syntaxes/EEx.tmLanguage diff --git a/plugins/textmate/testData/bundles/elixir/Syntaxes/Elixir.tmLanguage b/plugins/textmate/tests/testData/bundles/elixir/Syntaxes/Elixir.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/elixir/Syntaxes/Elixir.tmLanguage rename to plugins/textmate/tests/testData/bundles/elixir/Syntaxes/Elixir.tmLanguage diff --git a/plugins/textmate/testData/bundles/elixir/Syntaxes/HTML (EEx).tmLanguage b/plugins/textmate/tests/testData/bundles/elixir/Syntaxes/HTML (EEx).tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/elixir/Syntaxes/HTML (EEx).tmLanguage rename to plugins/textmate/tests/testData/bundles/elixir/Syntaxes/HTML (EEx).tmLanguage diff --git a/plugins/textmate/testData/bundles/elixir/info.plist b/plugins/textmate/tests/testData/bundles/elixir/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/elixir/info.plist rename to plugins/textmate/tests/testData/bundles/elixir/info.plist diff --git a/plugins/textmate/testData/bundles/html/Preferences/Comments.plist b/plugins/textmate/tests/testData/bundles/html/Preferences/Comments.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Preferences/Comments.plist rename to plugins/textmate/tests/testData/bundles/html/Preferences/Comments.plist diff --git a/plugins/textmate/testData/bundles/html/Preferences/Completions HTML Attributes.tmPreferences b/plugins/textmate/tests/testData/bundles/html/Preferences/Completions HTML Attributes.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/html/Preferences/Completions HTML Attributes.tmPreferences rename to plugins/textmate/tests/testData/bundles/html/Preferences/Completions HTML Attributes.tmPreferences diff --git a/plugins/textmate/testData/bundles/html/Preferences/Empty tag typing pairs.plist b/plugins/textmate/tests/testData/bundles/html/Preferences/Empty tag typing pairs.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Preferences/Empty tag typing pairs.plist rename to plugins/textmate/tests/testData/bundles/html/Preferences/Empty tag typing pairs.plist diff --git a/plugins/textmate/testData/bundles/html/Preferences/Folding.tmPreferences b/plugins/textmate/tests/testData/bundles/html/Preferences/Folding.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/html/Preferences/Folding.tmPreferences rename to plugins/textmate/tests/testData/bundles/html/Preferences/Folding.tmPreferences diff --git a/plugins/textmate/testData/bundles/html/Preferences/Indent Corrections.tmPreferences b/plugins/textmate/tests/testData/bundles/html/Preferences/Indent Corrections.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/html/Preferences/Indent Corrections.tmPreferences rename to plugins/textmate/tests/testData/bundles/html/Preferences/Indent Corrections.tmPreferences diff --git a/plugins/textmate/testData/bundles/html/Preferences/Miscellaneous.plist b/plugins/textmate/tests/testData/bundles/html/Preferences/Miscellaneous.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Preferences/Miscellaneous.plist rename to plugins/textmate/tests/testData/bundles/html/Preferences/Miscellaneous.plist diff --git a/plugins/textmate/testData/bundles/html/Preferences/Tag Completions.tmPreferences b/plugins/textmate/tests/testData/bundles/html/Preferences/Tag Completions.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/html/Preferences/Tag Completions.tmPreferences rename to plugins/textmate/tests/testData/bundles/html/Preferences/Tag Completions.tmPreferences diff --git a/plugins/textmate/testData/bundles/html/Preferences/Tag preferences.plist b/plugins/textmate/tests/testData/bundles/html/Preferences/Tag preferences.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Preferences/Tag preferences.plist rename to plugins/textmate/tests/testData/bundles/html/Preferences/Tag preferences.plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/DocType HTML 4.0 Strict.plist b/plugins/textmate/tests/testData/bundles/html/Snippets/DocType HTML 4.0 Strict.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/DocType HTML 4.0 Strict.plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/DocType HTML 4.0 Strict.plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/DocType HTML 5.plist b/plugins/textmate/tests/testData/bundles/html/Snippets/DocType HTML 5.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/DocType HTML 5.plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/DocType HTML 5.plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/DocType XHTL 1.0 Frameset.plist b/plugins/textmate/tests/testData/bundles/html/Snippets/DocType XHTL 1.0 Frameset.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/DocType XHTL 1.0 Frameset.plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/DocType XHTL 1.0 Frameset.plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/DocType XHTML 1.0 Strict.plist b/plugins/textmate/tests/testData/bundles/html/Snippets/DocType XHTML 1.0 Strict.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/DocType XHTML 1.0 Strict.plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/DocType XHTML 1.0 Strict.plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/DocType XHTML 1.0 Transitional.plist b/plugins/textmate/tests/testData/bundles/html/Snippets/DocType XHTML 1.0 Transitional.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/DocType XHTML 1.0 Transitional.plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/DocType XHTML 1.0 Transitional.plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/DocType XHTML 1.1.plist b/plugins/textmate/tests/testData/bundles/html/Snippets/DocType XHTML 1.1.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/DocType XHTML 1.1.plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/DocType XHTML 1.1.plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/Embed QT movie (movie).plist b/plugins/textmate/tests/testData/bundles/html/Snippets/Embed QT movie (movie).plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/Embed QT movie (movie).plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/Embed QT movie (movie).plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/Emphasize.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/Emphasize.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/Emphasize.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/Emphasize.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/Fieldset.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/Fieldset.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/Fieldset.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/Fieldset.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/HTML 4.0 Transitional (doctype).plist b/plugins/textmate/tests/testData/bundles/html/Snippets/HTML 4.0 Transitional (doctype).plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/HTML 4.0 Transitional (doctype).plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/HTML 4.0 Transitional (doctype).plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_0 only.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_0 only.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_0 only.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_0 only.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_5 only.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_5 only.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_5 only.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_5 only.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_x.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_x.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_x.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 5_x.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 and below.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 and below.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 and below.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 and below.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 only.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 only.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 only.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 6 only.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 7.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 7.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 7.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer 7.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_Internet Explorer.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_NOT Internet Explorer.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_NOT Internet Explorer.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/IE Conditional Comment_NOT Internet Explorer.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/IE Conditional Comment_NOT Internet Explorer.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/Input with Label.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/Input with Label.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/Input with Label.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/Input with Label.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/Option.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/Option.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/Option.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/Option.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/Select Box.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/Select Box.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/Select Box.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/Select Box.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/Smart return_indent for tag pairs.plist b/plugins/textmate/tests/testData/bundles/html/Snippets/Smart return_indent for tag pairs.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/Smart return_indent for tag pairs.plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/Smart return_indent for tag pairs.plist diff --git a/plugins/textmate/testData/bundles/html/Snippets/Strong.tmSnippet b/plugins/textmate/tests/testData/bundles/html/Snippets/Strong.tmSnippet similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/Strong.tmSnippet rename to plugins/textmate/tests/testData/bundles/html/Snippets/Strong.tmSnippet diff --git a/plugins/textmate/testData/bundles/html/Snippets/XHTML_div.plist b/plugins/textmate/tests/testData/bundles/html/Snippets/XHTML_div.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Snippets/XHTML_div.plist rename to plugins/textmate/tests/testData/bundles/html/Snippets/XHTML_div.plist diff --git a/plugins/textmate/testData/bundles/html/Syntaxes/HTML.plist b/plugins/textmate/tests/testData/bundles/html/Syntaxes/HTML.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/Syntaxes/HTML.plist rename to plugins/textmate/tests/testData/bundles/html/Syntaxes/HTML.plist diff --git a/plugins/textmate/testData/bundles/html/info.plist b/plugins/textmate/tests/testData/bundles/html/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/html/info.plist rename to plugins/textmate/tests/testData/bundles/html/info.plist diff --git a/plugins/textmate/testData/bundles/html_vsc/.vscodeignore b/plugins/textmate/tests/testData/bundles/html_vsc/.vscodeignore similarity index 100% rename from plugins/textmate/testData/bundles/html_vsc/.vscodeignore rename to plugins/textmate/tests/testData/bundles/html_vsc/.vscodeignore diff --git a/plugins/textmate/testData/bundles/html_vsc/cgmanifest.json b/plugins/textmate/tests/testData/bundles/html_vsc/cgmanifest.json similarity index 100% rename from plugins/textmate/testData/bundles/html_vsc/cgmanifest.json rename to plugins/textmate/tests/testData/bundles/html_vsc/cgmanifest.json diff --git a/plugins/textmate/testData/bundles/html_vsc/language-configuration.json b/plugins/textmate/tests/testData/bundles/html_vsc/language-configuration.json similarity index 100% rename from plugins/textmate/testData/bundles/html_vsc/language-configuration.json rename to plugins/textmate/tests/testData/bundles/html_vsc/language-configuration.json diff --git a/plugins/textmate/testData/bundles/html_vsc/package.json b/plugins/textmate/tests/testData/bundles/html_vsc/package.json similarity index 100% rename from plugins/textmate/testData/bundles/html_vsc/package.json rename to plugins/textmate/tests/testData/bundles/html_vsc/package.json diff --git a/plugins/textmate/testData/bundles/html_vsc/package.nls.json b/plugins/textmate/tests/testData/bundles/html_vsc/package.nls.json similarity index 100% rename from plugins/textmate/testData/bundles/html_vsc/package.nls.json rename to plugins/textmate/tests/testData/bundles/html_vsc/package.nls.json diff --git a/plugins/textmate/testData/bundles/html_vsc/syntaxes/html-derivative.tmLanguage.json b/plugins/textmate/tests/testData/bundles/html_vsc/syntaxes/html-derivative.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/html_vsc/syntaxes/html-derivative.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/html_vsc/syntaxes/html-derivative.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/html_vsc/syntaxes/html.tmLanguage.json b/plugins/textmate/tests/testData/bundles/html_vsc/syntaxes/html.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/html_vsc/syntaxes/html.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/html_vsc/syntaxes/html.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/invalid_bundle/stub b/plugins/textmate/tests/testData/bundles/invalid_bundle/stub similarity index 100% rename from plugins/textmate/testData/bundles/invalid_bundle/stub rename to plugins/textmate/tests/testData/bundles/invalid_bundle/stub diff --git a/plugins/textmate/testData/bundles/javascript/.vscodeignore b/plugins/textmate/tests/testData/bundles/javascript/.vscodeignore similarity index 100% rename from plugins/textmate/testData/bundles/javascript/.vscodeignore rename to plugins/textmate/tests/testData/bundles/javascript/.vscodeignore diff --git a/plugins/textmate/testData/bundles/javascript/cgmanifest.json b/plugins/textmate/tests/testData/bundles/javascript/cgmanifest.json similarity index 100% rename from plugins/textmate/testData/bundles/javascript/cgmanifest.json rename to plugins/textmate/tests/testData/bundles/javascript/cgmanifest.json diff --git a/plugins/textmate/testData/bundles/javascript/javascript-language-configuration.json b/plugins/textmate/tests/testData/bundles/javascript/javascript-language-configuration.json similarity index 100% rename from plugins/textmate/testData/bundles/javascript/javascript-language-configuration.json rename to plugins/textmate/tests/testData/bundles/javascript/javascript-language-configuration.json diff --git a/plugins/textmate/testData/bundles/javascript/package.json b/plugins/textmate/tests/testData/bundles/javascript/package.json similarity index 100% rename from plugins/textmate/testData/bundles/javascript/package.json rename to plugins/textmate/tests/testData/bundles/javascript/package.json diff --git a/plugins/textmate/testData/bundles/javascript/package.nls.json b/plugins/textmate/tests/testData/bundles/javascript/package.nls.json similarity index 100% rename from plugins/textmate/testData/bundles/javascript/package.nls.json rename to plugins/textmate/tests/testData/bundles/javascript/package.nls.json diff --git a/plugins/textmate/testData/bundles/javascript/schemas/jsconfig.schema.json b/plugins/textmate/tests/testData/bundles/javascript/schemas/jsconfig.schema.json similarity index 100% rename from plugins/textmate/testData/bundles/javascript/schemas/jsconfig.schema.json rename to plugins/textmate/tests/testData/bundles/javascript/schemas/jsconfig.schema.json diff --git a/plugins/textmate/testData/bundles/javascript/snippets/javascript.json b/plugins/textmate/tests/testData/bundles/javascript/snippets/javascript.json similarity index 100% rename from plugins/textmate/testData/bundles/javascript/snippets/javascript.json rename to plugins/textmate/tests/testData/bundles/javascript/snippets/javascript.json diff --git a/plugins/textmate/testData/bundles/javascript/syntaxes/JavaScript.tmLanguage.json b/plugins/textmate/tests/testData/bundles/javascript/syntaxes/JavaScript.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/javascript/syntaxes/JavaScript.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/javascript/syntaxes/JavaScript.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/plugins/textmate/tests/testData/bundles/javascript/syntaxes/JavaScriptReact.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/javascript/syntaxes/JavaScriptReact.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/javascript/syntaxes/JavaScriptReact.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/javascript/syntaxes/Readme.md b/plugins/textmate/tests/testData/bundles/javascript/syntaxes/Readme.md similarity index 100% rename from plugins/textmate/testData/bundles/javascript/syntaxes/Readme.md rename to plugins/textmate/tests/testData/bundles/javascript/syntaxes/Readme.md diff --git a/plugins/textmate/testData/bundles/javascript/syntaxes/Regular Expressions (JavaScript).tmLanguage b/plugins/textmate/tests/testData/bundles/javascript/syntaxes/Regular Expressions (JavaScript).tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/javascript/syntaxes/Regular Expressions (JavaScript).tmLanguage rename to plugins/textmate/tests/testData/bundles/javascript/syntaxes/Regular Expressions (JavaScript).tmLanguage diff --git a/plugins/textmate/testData/bundles/javascript/tags-language-configuration.json b/plugins/textmate/tests/testData/bundles/javascript/tags-language-configuration.json similarity index 100% rename from plugins/textmate/testData/bundles/javascript/tags-language-configuration.json rename to plugins/textmate/tests/testData/bundles/javascript/tags-language-configuration.json diff --git a/plugins/textmate/testData/bundles/laravel-blade/info.plist b/plugins/textmate/tests/testData/bundles/laravel-blade/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/laravel-blade/info.plist rename to plugins/textmate/tests/testData/bundles/laravel-blade/info.plist diff --git a/plugins/textmate/testData/bundles/laravel-blade/laravel-blade.tmLanguage b/plugins/textmate/tests/testData/bundles/laravel-blade/laravel-blade.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/laravel-blade/laravel-blade.tmLanguage rename to plugins/textmate/tests/testData/bundles/laravel-blade/laravel-blade.tmLanguage diff --git a/plugins/textmate/testData/bundles/latex/Preferences/Comments.plist b/plugins/textmate/tests/testData/bundles/latex/Preferences/Comments.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/Comments.plist rename to plugins/textmate/tests/testData/bundles/latex/Preferences/Comments.plist diff --git a/plugins/textmate/testData/bundles/latex/Preferences/Disable Smart Typing after Backslashes.tmPreferences b/plugins/textmate/tests/testData/bundles/latex/Preferences/Disable Smart Typing after Backslashes.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/Disable Smart Typing after Backslashes.tmPreferences rename to plugins/textmate/tests/testData/bundles/latex/Preferences/Disable Smart Typing after Backslashes.tmPreferences diff --git a/plugins/textmate/testData/bundles/latex/Preferences/Folding - BibTeX.tmPreferences b/plugins/textmate/tests/testData/bundles/latex/Preferences/Folding - BibTeX.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/Folding - BibTeX.tmPreferences rename to plugins/textmate/tests/testData/bundles/latex/Preferences/Folding - BibTeX.tmPreferences diff --git a/plugins/textmate/testData/bundles/latex/Preferences/Folding - LaTeX.tmPreferences b/plugins/textmate/tests/testData/bundles/latex/Preferences/Folding - LaTeX.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/Folding - LaTeX.tmPreferences rename to plugins/textmate/tests/testData/bundles/latex/Preferences/Folding - LaTeX.tmPreferences diff --git a/plugins/textmate/testData/bundles/latex/Preferences/Folding - Log.tmPreferences b/plugins/textmate/tests/testData/bundles/latex/Preferences/Folding - Log.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/Folding - Log.tmPreferences rename to plugins/textmate/tests/testData/bundles/latex/Preferences/Folding - Log.tmPreferences diff --git a/plugins/textmate/testData/bundles/latex/Preferences/Folding - TeX.tmPreferences b/plugins/textmate/tests/testData/bundles/latex/Preferences/Folding - TeX.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/Folding - TeX.tmPreferences rename to plugins/textmate/tests/testData/bundles/latex/Preferences/Folding - TeX.tmPreferences diff --git a/plugins/textmate/testData/bundles/latex/Preferences/Miscellaneous.plist b/plugins/textmate/tests/testData/bundles/latex/Preferences/Miscellaneous.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/Miscellaneous.plist rename to plugins/textmate/tests/testData/bundles/latex/Preferences/Miscellaneous.plist diff --git a/plugins/textmate/testData/bundles/latex/Preferences/Smart Typing (Strings).tmPreferences b/plugins/textmate/tests/testData/bundles/latex/Preferences/Smart Typing (Strings).tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/Smart Typing (Strings).tmPreferences rename to plugins/textmate/tests/testData/bundles/latex/Preferences/Smart Typing (Strings).tmPreferences diff --git a/plugins/textmate/testData/bundles/latex/Preferences/Symbol list.plist b/plugins/textmate/tests/testData/bundles/latex/Preferences/Symbol list.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/Symbol list.plist rename to plugins/textmate/tests/testData/bundles/latex/Preferences/Symbol list.plist diff --git a/plugins/textmate/testData/bundles/latex/Preferences/TexShop comments.plist b/plugins/textmate/tests/testData/bundles/latex/Preferences/TexShop comments.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/Preferences/TexShop comments.plist rename to plugins/textmate/tests/testData/bundles/latex/Preferences/TexShop comments.plist diff --git a/plugins/textmate/testData/bundles/latex/Syntaxes/Bibtex.plist b/plugins/textmate/tests/testData/bundles/latex/Syntaxes/Bibtex.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/Syntaxes/Bibtex.plist rename to plugins/textmate/tests/testData/bundles/latex/Syntaxes/Bibtex.plist diff --git a/plugins/textmate/testData/bundles/latex/Syntaxes/LaTeX Beamer.plist b/plugins/textmate/tests/testData/bundles/latex/Syntaxes/LaTeX Beamer.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/Syntaxes/LaTeX Beamer.plist rename to plugins/textmate/tests/testData/bundles/latex/Syntaxes/LaTeX Beamer.plist diff --git a/plugins/textmate/testData/bundles/latex/Syntaxes/LaTeX Log.plist b/plugins/textmate/tests/testData/bundles/latex/Syntaxes/LaTeX Log.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/Syntaxes/LaTeX Log.plist rename to plugins/textmate/tests/testData/bundles/latex/Syntaxes/LaTeX Log.plist diff --git a/plugins/textmate/testData/bundles/latex/Syntaxes/LaTeX Memoir.tmLanguage b/plugins/textmate/tests/testData/bundles/latex/Syntaxes/LaTeX Memoir.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/latex/Syntaxes/LaTeX Memoir.tmLanguage rename to plugins/textmate/tests/testData/bundles/latex/Syntaxes/LaTeX Memoir.tmLanguage diff --git a/plugins/textmate/testData/bundles/latex/Syntaxes/LaTeX.plist b/plugins/textmate/tests/testData/bundles/latex/Syntaxes/LaTeX.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/Syntaxes/LaTeX.plist rename to plugins/textmate/tests/testData/bundles/latex/Syntaxes/LaTeX.plist diff --git a/plugins/textmate/testData/bundles/latex/Syntaxes/TeX.plist b/plugins/textmate/tests/testData/bundles/latex/Syntaxes/TeX.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/Syntaxes/TeX.plist rename to plugins/textmate/tests/testData/bundles/latex/Syntaxes/TeX.plist diff --git a/plugins/textmate/testData/bundles/latex/info.plist b/plugins/textmate/tests/testData/bundles/latex/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/latex/info.plist rename to plugins/textmate/tests/testData/bundles/latex/info.plist diff --git a/plugins/textmate/testData/bundles/markdown_blogging/blogging.tmLanguage b/plugins/textmate/tests/testData/bundles/markdown_blogging/blogging.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/markdown_blogging/blogging.tmLanguage rename to plugins/textmate/tests/testData/bundles/markdown_blogging/blogging.tmLanguage diff --git a/plugins/textmate/testData/bundles/markdown_sublime/Markdown.tmLanguage b/plugins/textmate/tests/testData/bundles/markdown_sublime/Markdown.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/markdown_sublime/Markdown.tmLanguage rename to plugins/textmate/tests/testData/bundles/markdown_sublime/Markdown.tmLanguage diff --git a/plugins/textmate/testData/bundles/markdown_sublime/MultiMarkdown.tmLanguage b/plugins/textmate/tests/testData/bundles/markdown_sublime/MultiMarkdown.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/markdown_sublime/MultiMarkdown.tmLanguage rename to plugins/textmate/tests/testData/bundles/markdown_sublime/MultiMarkdown.tmLanguage diff --git a/plugins/textmate/testData/bundles/markdown_textmate/Preferences/Typing_pairs.plist b/plugins/textmate/tests/testData/bundles/markdown_textmate/Preferences/Typing_pairs.plist similarity index 100% rename from plugins/textmate/testData/bundles/markdown_textmate/Preferences/Typing_pairs.plist rename to plugins/textmate/tests/testData/bundles/markdown_textmate/Preferences/Typing_pairs.plist diff --git a/plugins/textmate/testData/bundles/markdown_textmate/Syntaxes/Markdown.tmLanguage b/plugins/textmate/tests/testData/bundles/markdown_textmate/Syntaxes/Markdown.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/markdown_textmate/Syntaxes/Markdown.tmLanguage rename to plugins/textmate/tests/testData/bundles/markdown_textmate/Syntaxes/Markdown.tmLanguage diff --git a/plugins/textmate/testData/bundles/markdown_textmate/info.plist b/plugins/textmate/tests/testData/bundles/markdown_textmate/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/markdown_textmate/info.plist rename to plugins/textmate/tests/testData/bundles/markdown_textmate/info.plist diff --git a/plugins/textmate/testData/bundles/perl/Preferences/Folding.tmPreferences b/plugins/textmate/tests/testData/bundles/perl/Preferences/Folding.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/perl/Preferences/Folding.tmPreferences rename to plugins/textmate/tests/testData/bundles/perl/Preferences/Folding.tmPreferences diff --git a/plugins/textmate/testData/bundles/perl/Preferences/Indentation.tmPreferences b/plugins/textmate/tests/testData/bundles/perl/Preferences/Indentation.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/perl/Preferences/Indentation.tmPreferences rename to plugins/textmate/tests/testData/bundles/perl/Preferences/Indentation.tmPreferences diff --git a/plugins/textmate/testData/bundles/perl/Preferences/Miscellaneous.plist b/plugins/textmate/tests/testData/bundles/perl/Preferences/Miscellaneous.plist similarity index 100% rename from plugins/textmate/testData/bundles/perl/Preferences/Miscellaneous.plist rename to plugins/textmate/tests/testData/bundles/perl/Preferences/Miscellaneous.plist diff --git a/plugins/textmate/testData/bundles/perl/Syntaxes/Perl 6.tmLanguage b/plugins/textmate/tests/testData/bundles/perl/Syntaxes/Perl 6.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/perl/Syntaxes/Perl 6.tmLanguage rename to plugins/textmate/tests/testData/bundles/perl/Syntaxes/Perl 6.tmLanguage diff --git a/plugins/textmate/testData/bundles/perl/Syntaxes/Perl.plist b/plugins/textmate/tests/testData/bundles/perl/Syntaxes/Perl.plist similarity index 100% rename from plugins/textmate/testData/bundles/perl/Syntaxes/Perl.plist rename to plugins/textmate/tests/testData/bundles/perl/Syntaxes/Perl.plist diff --git a/plugins/textmate/testData/bundles/perl/info.plist b/plugins/textmate/tests/testData/bundles/perl/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/perl/info.plist rename to plugins/textmate/tests/testData/bundles/perl/info.plist diff --git a/plugins/textmate/testData/bundles/php/Comments.tmPreferences b/plugins/textmate/tests/testData/bundles/php/Comments.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/php/Comments.tmPreferences rename to plugins/textmate/tests/testData/bundles/php/Comments.tmPreferences diff --git a/plugins/textmate/testData/bundles/php/Completion Rules.tmPreferences b/plugins/textmate/tests/testData/bundles/php/Completion Rules.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/php/Completion Rules.tmPreferences rename to plugins/textmate/tests/testData/bundles/php/Completion Rules.tmPreferences diff --git a/plugins/textmate/testData/bundles/php/Indentation Rules Annex.tmPreferences b/plugins/textmate/tests/testData/bundles/php/Indentation Rules Annex.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/php/Indentation Rules Annex.tmPreferences rename to plugins/textmate/tests/testData/bundles/php/Indentation Rules Annex.tmPreferences diff --git a/plugins/textmate/testData/bundles/php/Indentation Rules.tmPreferences b/plugins/textmate/tests/testData/bundles/php/Indentation Rules.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/php/Indentation Rules.tmPreferences rename to plugins/textmate/tests/testData/bundles/php/Indentation Rules.tmPreferences diff --git a/plugins/textmate/testData/bundles/php/PHP.tmLanguage b/plugins/textmate/tests/testData/bundles/php/PHP.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/php/PHP.tmLanguage rename to plugins/textmate/tests/testData/bundles/php/PHP.tmLanguage diff --git a/plugins/textmate/testData/bundles/php/Symbol List.tmPreferences b/plugins/textmate/tests/testData/bundles/php/Symbol List.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/php/Symbol List.tmPreferences rename to plugins/textmate/tests/testData/bundles/php/Symbol List.tmPreferences diff --git a/plugins/textmate/testData/bundles/php_vsc/language-configuration.json b/plugins/textmate/tests/testData/bundles/php_vsc/language-configuration.json similarity index 100% rename from plugins/textmate/testData/bundles/php_vsc/language-configuration.json rename to plugins/textmate/tests/testData/bundles/php_vsc/language-configuration.json diff --git a/plugins/textmate/testData/bundles/php_vsc/package.json b/plugins/textmate/tests/testData/bundles/php_vsc/package.json similarity index 100% rename from plugins/textmate/testData/bundles/php_vsc/package.json rename to plugins/textmate/tests/testData/bundles/php_vsc/package.json diff --git a/plugins/textmate/testData/bundles/php_vsc/package.nls.json b/plugins/textmate/tests/testData/bundles/php_vsc/package.nls.json similarity index 100% rename from plugins/textmate/testData/bundles/php_vsc/package.nls.json rename to plugins/textmate/tests/testData/bundles/php_vsc/package.nls.json diff --git a/plugins/textmate/testData/bundles/php_vsc/syntaxes/html.tmLanguage.json b/plugins/textmate/tests/testData/bundles/php_vsc/syntaxes/html.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/php_vsc/syntaxes/html.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/php_vsc/syntaxes/html.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/php_vsc/syntaxes/php.tmLanguage.json b/plugins/textmate/tests/testData/bundles/php_vsc/syntaxes/php.tmLanguage.json similarity index 100% rename from plugins/textmate/testData/bundles/php_vsc/syntaxes/php.tmLanguage.json rename to plugins/textmate/tests/testData/bundles/php_vsc/syntaxes/php.tmLanguage.json diff --git a/plugins/textmate/testData/bundles/preferences_test/htmlOnly.tmPreferences b/plugins/textmate/tests/testData/bundles/preferences_test/htmlOnly.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/preferences_test/htmlOnly.tmPreferences rename to plugins/textmate/tests/testData/bundles/preferences_test/htmlOnly.tmPreferences diff --git a/plugins/textmate/testData/bundles/preferences_test/phpOnly.tmPreferences b/plugins/textmate/tests/testData/bundles/preferences_test/phpOnly.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/preferences_test/phpOnly.tmPreferences rename to plugins/textmate/tests/testData/bundles/preferences_test/phpOnly.tmPreferences diff --git a/plugins/textmate/testData/bundles/preferences_test/sameScope1.tmPreferences b/plugins/textmate/tests/testData/bundles/preferences_test/sameScope1.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/preferences_test/sameScope1.tmPreferences rename to plugins/textmate/tests/testData/bundles/preferences_test/sameScope1.tmPreferences diff --git a/plugins/textmate/testData/bundles/preferences_test/sameScope2.tmPreferences b/plugins/textmate/tests/testData/bundles/preferences_test/sameScope2.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/preferences_test/sameScope2.tmPreferences rename to plugins/textmate/tests/testData/bundles/preferences_test/sameScope2.tmPreferences diff --git a/plugins/textmate/testData/bundles/python/Python.tmLanguage b/plugins/textmate/tests/testData/bundles/python/Python.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/python/Python.tmLanguage rename to plugins/textmate/tests/testData/bundles/python/Python.tmLanguage diff --git a/plugins/textmate/testData/bundles/ruby/Syntaxes/HTML (Ruby - ERB).tmLanguage b/plugins/textmate/tests/testData/bundles/ruby/Syntaxes/HTML (Ruby - ERB).tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/ruby/Syntaxes/HTML (Ruby - ERB).tmLanguage rename to plugins/textmate/tests/testData/bundles/ruby/Syntaxes/HTML (Ruby - ERB).tmLanguage diff --git a/plugins/textmate/testData/bundles/ruby/Syntaxes/Ruby.plist b/plugins/textmate/tests/testData/bundles/ruby/Syntaxes/Ruby.plist similarity index 100% rename from plugins/textmate/testData/bundles/ruby/Syntaxes/Ruby.plist rename to plugins/textmate/tests/testData/bundles/ruby/Syntaxes/Ruby.plist diff --git a/plugins/textmate/testData/bundles/ruby/info.plist b/plugins/textmate/tests/testData/bundles/ruby/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/ruby/info.plist rename to plugins/textmate/tests/testData/bundles/ruby/info.plist diff --git a/plugins/textmate/testData/bundles/shellscript/Syntaxes/Shell-Unix-Bash.tmLanguage b/plugins/textmate/tests/testData/bundles/shellscript/Syntaxes/Shell-Unix-Bash.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/shellscript/Syntaxes/Shell-Unix-Bash.tmLanguage rename to plugins/textmate/tests/testData/bundles/shellscript/Syntaxes/Shell-Unix-Bash.tmLanguage diff --git a/plugins/textmate/testData/bundles/shellscript/info.plist b/plugins/textmate/tests/testData/bundles/shellscript/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/shellscript/info.plist rename to plugins/textmate/tests/testData/bundles/shellscript/info.plist diff --git a/plugins/textmate/testData/bundles/smarty/Preferences/Comments.tmPreferences b/plugins/textmate/tests/testData/bundles/smarty/Preferences/Comments.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/smarty/Preferences/Comments.tmPreferences rename to plugins/textmate/tests/testData/bundles/smarty/Preferences/Comments.tmPreferences diff --git a/plugins/textmate/testData/bundles/smarty/Preferences/Folding.tmPreferences b/plugins/textmate/tests/testData/bundles/smarty/Preferences/Folding.tmPreferences similarity index 100% rename from plugins/textmate/testData/bundles/smarty/Preferences/Folding.tmPreferences rename to plugins/textmate/tests/testData/bundles/smarty/Preferences/Folding.tmPreferences diff --git a/plugins/textmate/testData/bundles/smarty/Syntaxes/Smarty.plist b/plugins/textmate/tests/testData/bundles/smarty/Syntaxes/Smarty.plist similarity index 100% rename from plugins/textmate/testData/bundles/smarty/Syntaxes/Smarty.plist rename to plugins/textmate/tests/testData/bundles/smarty/Syntaxes/Smarty.plist diff --git a/plugins/textmate/testData/bundles/smarty/info.plist b/plugins/textmate/tests/testData/bundles/smarty/info.plist similarity index 100% rename from plugins/textmate/testData/bundles/smarty/info.plist rename to plugins/textmate/tests/testData/bundles/smarty/info.plist diff --git a/plugins/textmate/testData/bundles/turtle/Turtle.tmLanguage b/plugins/textmate/tests/testData/bundles/turtle/Turtle.tmLanguage similarity index 100% rename from plugins/textmate/testData/bundles/turtle/Turtle.tmLanguage rename to plugins/textmate/tests/testData/bundles/turtle/Turtle.tmLanguage diff --git a/plugins/textmate/testData/editor/data/batLineCommenter.bat_hack b/plugins/textmate/tests/testData/editor/data/batLineCommenter.bat_hack similarity index 100% rename from plugins/textmate/testData/editor/data/batLineCommenter.bat_hack rename to plugins/textmate/tests/testData/editor/data/batLineCommenter.bat_hack diff --git a/plugins/textmate/testData/editor/data/batLineCommenter_after.bat_hack b/plugins/textmate/tests/testData/editor/data/batLineCommenter_after.bat_hack similarity index 100% rename from plugins/textmate/testData/editor/data/batLineCommenter_after.bat_hack rename to plugins/textmate/tests/testData/editor/data/batLineCommenter_after.bat_hack diff --git a/plugins/textmate/testData/editor/data/blockCommenter.php_hack b/plugins/textmate/tests/testData/editor/data/blockCommenter.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/blockCommenter.php_hack rename to plugins/textmate/tests/testData/editor/data/blockCommenter.php_hack diff --git a/plugins/textmate/testData/editor/data/blockCommenterInInjection.php_hack b/plugins/textmate/tests/testData/editor/data/blockCommenterInInjection.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/blockCommenterInInjection.php_hack rename to plugins/textmate/tests/testData/editor/data/blockCommenterInInjection.php_hack diff --git a/plugins/textmate/testData/editor/data/blockCommenterInInjection_2.php_hack b/plugins/textmate/tests/testData/editor/data/blockCommenterInInjection_2.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/blockCommenterInInjection_2.php_hack rename to plugins/textmate/tests/testData/editor/data/blockCommenterInInjection_2.php_hack diff --git a/plugins/textmate/testData/editor/data/blockCommenterInInjection_2_after.php_hack b/plugins/textmate/tests/testData/editor/data/blockCommenterInInjection_2_after.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/blockCommenterInInjection_2_after.php_hack rename to plugins/textmate/tests/testData/editor/data/blockCommenterInInjection_2_after.php_hack diff --git a/plugins/textmate/testData/editor/data/blockCommenterInInjection_after.php_hack b/plugins/textmate/tests/testData/editor/data/blockCommenterInInjection_after.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/blockCommenterInInjection_after.php_hack rename to plugins/textmate/tests/testData/editor/data/blockCommenterInInjection_after.php_hack diff --git a/plugins/textmate/testData/editor/data/blockCommenter_after.php_hack b/plugins/textmate/tests/testData/editor/data/blockCommenter_after.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/blockCommenter_after.php_hack rename to plugins/textmate/tests/testData/editor/data/blockCommenter_after.php_hack diff --git a/plugins/textmate/testData/editor/data/commenterInInjectedCode.php_hack b/plugins/textmate/tests/testData/editor/data/commenterInInjectedCode.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/commenterInInjectedCode.php_hack rename to plugins/textmate/tests/testData/editor/data/commenterInInjectedCode.php_hack diff --git a/plugins/textmate/testData/editor/data/commenterInInjectedCode_after.php_hack b/plugins/textmate/tests/testData/editor/data/commenterInInjectedCode_after.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/commenterInInjectedCode_after.php_hack rename to plugins/textmate/tests/testData/editor/data/commenterInInjectedCode_after.php_hack diff --git a/plugins/textmate/testData/editor/data/jsxBlockCommenter.jsx_hack b/plugins/textmate/tests/testData/editor/data/jsxBlockCommenter.jsx_hack similarity index 100% rename from plugins/textmate/testData/editor/data/jsxBlockCommenter.jsx_hack rename to plugins/textmate/tests/testData/editor/data/jsxBlockCommenter.jsx_hack diff --git a/plugins/textmate/testData/editor/data/jsxBlockCommenter_after.jsx_hack b/plugins/textmate/tests/testData/editor/data/jsxBlockCommenter_after.jsx_hack similarity index 100% rename from plugins/textmate/testData/editor/data/jsxBlockCommenter_after.jsx_hack rename to plugins/textmate/tests/testData/editor/data/jsxBlockCommenter_after.jsx_hack diff --git a/plugins/textmate/testData/editor/data/latexLineCommenter.tex b/plugins/textmate/tests/testData/editor/data/latexLineCommenter.tex similarity index 100% rename from plugins/textmate/testData/editor/data/latexLineCommenter.tex rename to plugins/textmate/tests/testData/editor/data/latexLineCommenter.tex diff --git a/plugins/textmate/testData/editor/data/latexLineCommenter_after.tex b/plugins/textmate/tests/testData/editor/data/latexLineCommenter_after.tex similarity index 100% rename from plugins/textmate/testData/editor/data/latexLineCommenter_after.tex rename to plugins/textmate/tests/testData/editor/data/latexLineCommenter_after.tex diff --git a/plugins/textmate/testData/editor/data/phpLineCommenter.php_hack b/plugins/textmate/tests/testData/editor/data/phpLineCommenter.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/phpLineCommenter.php_hack rename to plugins/textmate/tests/testData/editor/data/phpLineCommenter.php_hack diff --git a/plugins/textmate/testData/editor/data/phpLineCommenter_after.php_hack b/plugins/textmate/tests/testData/editor/data/phpLineCommenter_after.php_hack similarity index 100% rename from plugins/textmate/testData/editor/data/phpLineCommenter_after.php_hack rename to plugins/textmate/tests/testData/editor/data/phpLineCommenter_after.php_hack diff --git a/plugins/textmate/testData/lexer/astro/text.astro b/plugins/textmate/tests/testData/lexer/astro/text.astro similarity index 100% rename from plugins/textmate/testData/lexer/astro/text.astro rename to plugins/textmate/tests/testData/lexer/astro/text.astro diff --git a/plugins/textmate/testData/lexer/astro/text_after.astro b/plugins/textmate/tests/testData/lexer/astro/text_after.astro similarity index 100% rename from plugins/textmate/testData/lexer/astro/text_after.astro rename to plugins/textmate/tests/testData/lexer/astro/text_after.astro diff --git a/plugins/textmate/testData/lexer/bat/bat.bat_hack b/plugins/textmate/tests/testData/lexer/bat/bat.bat_hack similarity index 100% rename from plugins/textmate/testData/lexer/bat/bat.bat_hack rename to plugins/textmate/tests/testData/lexer/bat/bat.bat_hack diff --git a/plugins/textmate/testData/lexer/bat/bat_after.bat_hack b/plugins/textmate/tests/testData/lexer/bat/bat_after.bat_hack similarity index 100% rename from plugins/textmate/testData/lexer/bat/bat_after.bat_hack rename to plugins/textmate/tests/testData/lexer/bat/bat_after.bat_hack diff --git a/plugins/textmate/testData/lexer/coldfusion/coldfusion.cfm b/plugins/textmate/tests/testData/lexer/coldfusion/coldfusion.cfm similarity index 100% rename from plugins/textmate/testData/lexer/coldfusion/coldfusion.cfm rename to plugins/textmate/tests/testData/lexer/coldfusion/coldfusion.cfm diff --git a/plugins/textmate/testData/lexer/coldfusion/coldfusion_after.cfm b/plugins/textmate/tests/testData/lexer/coldfusion/coldfusion_after.cfm similarity index 100% rename from plugins/textmate/testData/lexer/coldfusion/coldfusion_after.cfm rename to plugins/textmate/tests/testData/lexer/coldfusion/coldfusion_after.cfm diff --git a/plugins/textmate/testData/lexer/cpp/test.cc b/plugins/textmate/tests/testData/lexer/cpp/test.cc similarity index 100% rename from plugins/textmate/testData/lexer/cpp/test.cc rename to plugins/textmate/tests/testData/lexer/cpp/test.cc diff --git a/plugins/textmate/testData/lexer/cpp/test_after.cc b/plugins/textmate/tests/testData/lexer/cpp/test_after.cc similarity index 100% rename from plugins/textmate/testData/lexer/cpp/test_after.cc rename to plugins/textmate/tests/testData/lexer/cpp/test_after.cc diff --git a/plugins/textmate/testData/lexer/docker_vsc/Dockerfile b/plugins/textmate/tests/testData/lexer/docker_vsc/Dockerfile similarity index 100% rename from plugins/textmate/testData/lexer/docker_vsc/Dockerfile rename to plugins/textmate/tests/testData/lexer/docker_vsc/Dockerfile diff --git a/plugins/textmate/testData/lexer/docker_vsc/Dockerfile_after b/plugins/textmate/tests/testData/lexer/docker_vsc/Dockerfile_after similarity index 100% rename from plugins/textmate/testData/lexer/docker_vsc/Dockerfile_after rename to plugins/textmate/tests/testData/lexer/docker_vsc/Dockerfile_after diff --git a/plugins/textmate/testData/lexer/elixir/simpleTest.ex b/plugins/textmate/tests/testData/lexer/elixir/simpleTest.ex similarity index 100% rename from plugins/textmate/testData/lexer/elixir/simpleTest.ex rename to plugins/textmate/tests/testData/lexer/elixir/simpleTest.ex diff --git a/plugins/textmate/testData/lexer/elixir/simpleTest_after.ex b/plugins/textmate/tests/testData/lexer/elixir/simpleTest_after.ex similarity index 100% rename from plugins/textmate/testData/lexer/elixir/simpleTest_after.ex rename to plugins/textmate/tests/testData/lexer/elixir/simpleTest_after.ex diff --git a/plugins/textmate/testData/lexer/fsharp/test.fs b/plugins/textmate/tests/testData/lexer/fsharp/test.fs similarity index 100% rename from plugins/textmate/testData/lexer/fsharp/test.fs rename to plugins/textmate/tests/testData/lexer/fsharp/test.fs diff --git a/plugins/textmate/testData/lexer/fsharp/test_after.fs b/plugins/textmate/tests/testData/lexer/fsharp/test_after.fs similarity index 100% rename from plugins/textmate/testData/lexer/fsharp/test_after.fs rename to plugins/textmate/tests/testData/lexer/fsharp/test_after.fs diff --git a/plugins/textmate/testData/lexer/git/COMMIT_EDITMSG b/plugins/textmate/tests/testData/lexer/git/COMMIT_EDITMSG similarity index 100% rename from plugins/textmate/testData/lexer/git/COMMIT_EDITMSG rename to plugins/textmate/tests/testData/lexer/git/COMMIT_EDITMSG diff --git a/plugins/textmate/testData/lexer/git/COMMIT_EDITMSG_after b/plugins/textmate/tests/testData/lexer/git/COMMIT_EDITMSG_after similarity index 100% rename from plugins/textmate/testData/lexer/git/COMMIT_EDITMSG_after rename to plugins/textmate/tests/testData/lexer/git/COMMIT_EDITMSG_after diff --git a/plugins/textmate/testData/lexer/go/test.go b/plugins/textmate/tests/testData/lexer/go/test.go similarity index 100% rename from plugins/textmate/testData/lexer/go/test.go rename to plugins/textmate/tests/testData/lexer/go/test.go diff --git a/plugins/textmate/testData/lexer/go/test_after.go b/plugins/textmate/tests/testData/lexer/go/test_after.go similarity index 100% rename from plugins/textmate/testData/lexer/go/test_after.go rename to plugins/textmate/tests/testData/lexer/go/test_after.go diff --git a/plugins/textmate/testData/lexer/html_vsc/doctype.html b/plugins/textmate/tests/testData/lexer/html_vsc/doctype.html similarity index 100% rename from plugins/textmate/testData/lexer/html_vsc/doctype.html rename to plugins/textmate/tests/testData/lexer/html_vsc/doctype.html diff --git a/plugins/textmate/testData/lexer/html_vsc/doctype_after.html b/plugins/textmate/tests/testData/lexer/html_vsc/doctype_after.html similarity index 100% rename from plugins/textmate/testData/lexer/html_vsc/doctype_after.html rename to plugins/textmate/tests/testData/lexer/html_vsc/doctype_after.html diff --git a/plugins/textmate/testData/lexer/html_vsc/html_css.html b/plugins/textmate/tests/testData/lexer/html_vsc/html_css.html similarity index 100% rename from plugins/textmate/testData/lexer/html_vsc/html_css.html rename to plugins/textmate/tests/testData/lexer/html_vsc/html_css.html diff --git a/plugins/textmate/testData/lexer/html_vsc/html_css_after.html b/plugins/textmate/tests/testData/lexer/html_vsc/html_css_after.html similarity index 100% rename from plugins/textmate/testData/lexer/html_vsc/html_css_after.html rename to plugins/textmate/tests/testData/lexer/html_vsc/html_css_after.html diff --git a/plugins/textmate/testData/lexer/java/java.java b/plugins/textmate/tests/testData/lexer/java/java.java similarity index 100% rename from plugins/textmate/testData/lexer/java/java.java rename to plugins/textmate/tests/testData/lexer/java/java.java diff --git a/plugins/textmate/testData/lexer/java/java_after.java b/plugins/textmate/tests/testData/lexer/java/java_after.java similarity index 100% rename from plugins/textmate/testData/lexer/java/java_after.java rename to plugins/textmate/tests/testData/lexer/java/java_after.java diff --git a/plugins/textmate/testData/lexer/java/java_unicode_literal.java b/plugins/textmate/tests/testData/lexer/java/java_unicode_literal.java similarity index 100% rename from plugins/textmate/testData/lexer/java/java_unicode_literal.java rename to plugins/textmate/tests/testData/lexer/java/java_unicode_literal.java diff --git a/plugins/textmate/testData/lexer/java/java_unicode_literal_after.java b/plugins/textmate/tests/testData/lexer/java/java_unicode_literal_after.java similarity index 100% rename from plugins/textmate/testData/lexer/java/java_unicode_literal_after.java rename to plugins/textmate/tests/testData/lexer/java/java_unicode_literal_after.java diff --git a/plugins/textmate/testData/lexer/latex/text.tex b/plugins/textmate/tests/testData/lexer/latex/text.tex similarity index 100% rename from plugins/textmate/testData/lexer/latex/text.tex rename to plugins/textmate/tests/testData/lexer/latex/text.tex diff --git a/plugins/textmate/testData/lexer/latex/text_after.tex b/plugins/textmate/tests/testData/lexer/latex/text_after.tex similarity index 100% rename from plugins/textmate/testData/lexer/latex/text_after.tex rename to plugins/textmate/tests/testData/lexer/latex/text_after.tex diff --git a/plugins/textmate/testData/lexer/log/log.log b/plugins/textmate/tests/testData/lexer/log/log.log similarity index 100% rename from plugins/textmate/testData/lexer/log/log.log rename to plugins/textmate/tests/testData/lexer/log/log.log diff --git a/plugins/textmate/testData/lexer/log/log_after.log b/plugins/textmate/tests/testData/lexer/log/log_after.log similarity index 100% rename from plugins/textmate/testData/lexer/log/log_after.log rename to plugins/textmate/tests/testData/lexer/log/log_after.log diff --git a/plugins/textmate/testData/lexer/make/test.mk b/plugins/textmate/tests/testData/lexer/make/test.mk similarity index 100% rename from plugins/textmate/testData/lexer/make/test.mk rename to plugins/textmate/tests/testData/lexer/make/test.mk diff --git a/plugins/textmate/testData/lexer/make/test_after.mk b/plugins/textmate/tests/testData/lexer/make/test_after.mk similarity index 100% rename from plugins/textmate/testData/lexer/make/test_after.mk rename to plugins/textmate/tests/testData/lexer/make/test_after.mk diff --git a/plugins/textmate/testData/lexer/markdown/code.md b/plugins/textmate/tests/testData/lexer/markdown/code.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/code.md rename to plugins/textmate/tests/testData/lexer/markdown/code.md diff --git a/plugins/textmate/testData/lexer/markdown/code_after.md b/plugins/textmate/tests/testData/lexer/markdown/code_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/code_after.md rename to plugins/textmate/tests/testData/lexer/markdown/code_after.md diff --git a/plugins/textmate/testData/lexer/markdown/cyrillic.md b/plugins/textmate/tests/testData/lexer/markdown/cyrillic.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/cyrillic.md rename to plugins/textmate/tests/testData/lexer/markdown/cyrillic.md diff --git a/plugins/textmate/testData/lexer/markdown/cyrillic_after.md b/plugins/textmate/tests/testData/lexer/markdown/cyrillic_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/cyrillic_after.md rename to plugins/textmate/tests/testData/lexer/markdown/cyrillic_after.md diff --git a/plugins/textmate/testData/lexer/markdown/header_after_paragraph.md b/plugins/textmate/tests/testData/lexer/markdown/header_after_paragraph.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/header_after_paragraph.md rename to plugins/textmate/tests/testData/lexer/markdown/header_after_paragraph.md diff --git a/plugins/textmate/testData/lexer/markdown/header_after_paragraph_after.md b/plugins/textmate/tests/testData/lexer/markdown/header_after_paragraph_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/header_after_paragraph_after.md rename to plugins/textmate/tests/testData/lexer/markdown/header_after_paragraph_after.md diff --git a/plugins/textmate/testData/lexer/markdown/headers.md b/plugins/textmate/tests/testData/lexer/markdown/headers.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/headers.md rename to plugins/textmate/tests/testData/lexer/markdown/headers.md diff --git a/plugins/textmate/testData/lexer/markdown/headers_after.md b/plugins/textmate/tests/testData/lexer/markdown/headers_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/headers_after.md rename to plugins/textmate/tests/testData/lexer/markdown/headers_after.md diff --git a/plugins/textmate/testData/lexer/markdown/inline_bold.md b/plugins/textmate/tests/testData/lexer/markdown/inline_bold.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/inline_bold.md rename to plugins/textmate/tests/testData/lexer/markdown/inline_bold.md diff --git a/plugins/textmate/testData/lexer/markdown/inline_bold_after.md b/plugins/textmate/tests/testData/lexer/markdown/inline_bold_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/inline_bold_after.md rename to plugins/textmate/tests/testData/lexer/markdown/inline_bold_after.md diff --git a/plugins/textmate/testData/lexer/markdown/link.md b/plugins/textmate/tests/testData/lexer/markdown/link.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/link.md rename to plugins/textmate/tests/testData/lexer/markdown/link.md diff --git a/plugins/textmate/testData/lexer/markdown/link_after.md b/plugins/textmate/tests/testData/lexer/markdown/link_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/link_after.md rename to plugins/textmate/tests/testData/lexer/markdown/link_after.md diff --git a/plugins/textmate/testData/lexer/markdown/new_line_required_bug.md b/plugins/textmate/tests/testData/lexer/markdown/new_line_required_bug.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/new_line_required_bug.md rename to plugins/textmate/tests/testData/lexer/markdown/new_line_required_bug.md diff --git a/plugins/textmate/testData/lexer/markdown/new_line_required_bug_after.md b/plugins/textmate/tests/testData/lexer/markdown/new_line_required_bug_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/new_line_required_bug_after.md rename to plugins/textmate/tests/testData/lexer/markdown/new_line_required_bug_after.md diff --git a/plugins/textmate/testData/lexer/markdown/numbered_list.md b/plugins/textmate/tests/testData/lexer/markdown/numbered_list.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/numbered_list.md rename to plugins/textmate/tests/testData/lexer/markdown/numbered_list.md diff --git a/plugins/textmate/testData/lexer/markdown/numbered_list_after.md b/plugins/textmate/tests/testData/lexer/markdown/numbered_list_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/numbered_list_after.md rename to plugins/textmate/tests/testData/lexer/markdown/numbered_list_after.md diff --git a/plugins/textmate/testData/lexer/markdown/paragraph.md b/plugins/textmate/tests/testData/lexer/markdown/paragraph.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/paragraph.md rename to plugins/textmate/tests/testData/lexer/markdown/paragraph.md diff --git a/plugins/textmate/testData/lexer/markdown/paragraph_after.md b/plugins/textmate/tests/testData/lexer/markdown/paragraph_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/paragraph_after.md rename to plugins/textmate/tests/testData/lexer/markdown/paragraph_after.md diff --git a/plugins/textmate/testData/lexer/markdown/unknown_utf.md b/plugins/textmate/tests/testData/lexer/markdown/unknown_utf.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/unknown_utf.md rename to plugins/textmate/tests/testData/lexer/markdown/unknown_utf.md diff --git a/plugins/textmate/testData/lexer/markdown/unknown_utf_after.md b/plugins/textmate/tests/testData/lexer/markdown/unknown_utf_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown/unknown_utf_after.md rename to plugins/textmate/tests/testData/lexer/markdown/unknown_utf_after.md diff --git a/plugins/textmate/testData/lexer/markdown_blogging/ruby12703.blog.md b/plugins/textmate/tests/testData/lexer/markdown_blogging/ruby12703.blog.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_blogging/ruby12703.blog.md rename to plugins/textmate/tests/testData/lexer/markdown_blogging/ruby12703.blog.md diff --git a/plugins/textmate/testData/lexer/markdown_blogging/ruby12703.blog_after.md b/plugins/textmate/tests/testData/lexer/markdown_blogging/ruby12703.blog_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_blogging/ruby12703.blog_after.md rename to plugins/textmate/tests/testData/lexer/markdown_blogging/ruby12703.blog_after.md diff --git a/plugins/textmate/testData/lexer/markdown_blogging/ruby12703_after.blog.md b/plugins/textmate/tests/testData/lexer/markdown_blogging/ruby12703_after.blog.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_blogging/ruby12703_after.blog.md rename to plugins/textmate/tests/testData/lexer/markdown_blogging/ruby12703_after.blog.md diff --git a/plugins/textmate/testData/lexer/markdown_html/heading.md b/plugins/textmate/tests/testData/lexer/markdown_html/heading.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_html/heading.md rename to plugins/textmate/tests/testData/lexer/markdown_html/heading.md diff --git a/plugins/textmate/testData/lexer/markdown_html/heading_after.md b/plugins/textmate/tests/testData/lexer/markdown_html/heading_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_html/heading_after.md rename to plugins/textmate/tests/testData/lexer/markdown_html/heading_after.md diff --git a/plugins/textmate/testData/lexer/markdown_sublime/infinity_loop_bundle_bug.md b/plugins/textmate/tests/testData/lexer/markdown_sublime/infinity_loop_bundle_bug.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_sublime/infinity_loop_bundle_bug.md rename to plugins/textmate/tests/testData/lexer/markdown_sublime/infinity_loop_bundle_bug.md diff --git a/plugins/textmate/testData/lexer/markdown_sublime/infinity_loop_bundle_bug_after.md b/plugins/textmate/tests/testData/lexer/markdown_sublime/infinity_loop_bundle_bug_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_sublime/infinity_loop_bundle_bug_after.md rename to plugins/textmate/tests/testData/lexer/markdown_sublime/infinity_loop_bundle_bug_after.md diff --git a/plugins/textmate/testData/lexer/markdown_vsc/heading.md b/plugins/textmate/tests/testData/lexer/markdown_vsc/heading.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_vsc/heading.md rename to plugins/textmate/tests/testData/lexer/markdown_vsc/heading.md diff --git a/plugins/textmate/testData/lexer/markdown_vsc/heading_after.md b/plugins/textmate/tests/testData/lexer/markdown_vsc/heading_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_vsc/heading_after.md rename to plugins/textmate/tests/testData/lexer/markdown_vsc/heading_after.md diff --git a/plugins/textmate/testData/lexer/markdown_vsc/inline_bold.md b/plugins/textmate/tests/testData/lexer/markdown_vsc/inline_bold.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_vsc/inline_bold.md rename to plugins/textmate/tests/testData/lexer/markdown_vsc/inline_bold.md diff --git a/plugins/textmate/testData/lexer/markdown_vsc/inline_bold_after.md b/plugins/textmate/tests/testData/lexer/markdown_vsc/inline_bold_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_vsc/inline_bold_after.md rename to plugins/textmate/tests/testData/lexer/markdown_vsc/inline_bold_after.md diff --git a/plugins/textmate/testData/lexer/markdown_vsc/unknown_utf.md b/plugins/textmate/tests/testData/lexer/markdown_vsc/unknown_utf.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_vsc/unknown_utf.md rename to plugins/textmate/tests/testData/lexer/markdown_vsc/unknown_utf.md diff --git a/plugins/textmate/testData/lexer/markdown_vsc/unknown_utf_after.md b/plugins/textmate/tests/testData/lexer/markdown_vsc/unknown_utf_after.md similarity index 100% rename from plugins/textmate/testData/lexer/markdown_vsc/unknown_utf_after.md rename to plugins/textmate/tests/testData/lexer/markdown_vsc/unknown_utf_after.md diff --git a/plugins/textmate/testData/lexer/perl/perl.pl b/plugins/textmate/tests/testData/lexer/perl/perl.pl similarity index 100% rename from plugins/textmate/testData/lexer/perl/perl.pl rename to plugins/textmate/tests/testData/lexer/perl/perl.pl diff --git a/plugins/textmate/testData/lexer/perl/perl_after.pl b/plugins/textmate/tests/testData/lexer/perl/perl_after.pl similarity index 100% rename from plugins/textmate/testData/lexer/perl/perl_after.pl rename to plugins/textmate/tests/testData/lexer/perl/perl_after.pl diff --git a/plugins/textmate/testData/lexer/perl/regex.pl b/plugins/textmate/tests/testData/lexer/perl/regex.pl similarity index 100% rename from plugins/textmate/testData/lexer/perl/regex.pl rename to plugins/textmate/tests/testData/lexer/perl/regex.pl diff --git a/plugins/textmate/testData/lexer/perl/regex_after.pl b/plugins/textmate/tests/testData/lexer/perl/regex_after.pl similarity index 100% rename from plugins/textmate/testData/lexer/perl/regex_after.pl rename to plugins/textmate/tests/testData/lexer/perl/regex_after.pl diff --git a/plugins/textmate/testData/lexer/php/injection.php_hack b/plugins/textmate/tests/testData/lexer/php/injection.php_hack similarity index 100% rename from plugins/textmate/testData/lexer/php/injection.php_hack rename to plugins/textmate/tests/testData/lexer/php/injection.php_hack diff --git a/plugins/textmate/testData/lexer/php/injection_after.php_hack b/plugins/textmate/tests/testData/lexer/php/injection_after.php_hack similarity index 100% rename from plugins/textmate/testData/lexer/php/injection_after.php_hack rename to plugins/textmate/tests/testData/lexer/php/injection_after.php_hack diff --git a/plugins/textmate/testData/lexer/php_html/php_html.php b/plugins/textmate/tests/testData/lexer/php_html/php_html.php similarity index 100% rename from plugins/textmate/testData/lexer/php_html/php_html.php rename to plugins/textmate/tests/testData/lexer/php_html/php_html.php diff --git a/plugins/textmate/testData/lexer/php_vsc/empty.php_vsc b/plugins/textmate/tests/testData/lexer/php_vsc/empty.php_vsc similarity index 100% rename from plugins/textmate/testData/lexer/php_vsc/empty.php_vsc rename to plugins/textmate/tests/testData/lexer/php_vsc/empty.php_vsc diff --git a/plugins/textmate/testData/lexer/php_vsc/empty_after.php_vsc b/plugins/textmate/tests/testData/lexer/php_vsc/empty_after.php_vsc similarity index 100% rename from plugins/textmate/testData/lexer/php_vsc/empty_after.php_vsc rename to plugins/textmate/tests/testData/lexer/php_vsc/empty_after.php_vsc diff --git a/plugins/textmate/testData/lexer/php_vsc/escape_symbol.php_vsc b/plugins/textmate/tests/testData/lexer/php_vsc/escape_symbol.php_vsc similarity index 100% rename from plugins/textmate/testData/lexer/php_vsc/escape_symbol.php_vsc rename to plugins/textmate/tests/testData/lexer/php_vsc/escape_symbol.php_vsc diff --git a/plugins/textmate/testData/lexer/php_vsc/escape_symbol_after.php_vsc b/plugins/textmate/tests/testData/lexer/php_vsc/escape_symbol_after.php_vsc similarity index 100% rename from plugins/textmate/testData/lexer/php_vsc/escape_symbol_after.php_vsc rename to plugins/textmate/tests/testData/lexer/php_vsc/escape_symbol_after.php_vsc diff --git a/plugins/textmate/testData/lexer/php_vsc/html_css.php_vsc b/plugins/textmate/tests/testData/lexer/php_vsc/html_css.php_vsc similarity index 100% rename from plugins/textmate/testData/lexer/php_vsc/html_css.php_vsc rename to plugins/textmate/tests/testData/lexer/php_vsc/html_css.php_vsc diff --git a/plugins/textmate/testData/lexer/php_vsc/html_css_after.php_vsc b/plugins/textmate/tests/testData/lexer/php_vsc/html_css_after.php_vsc similarity index 100% rename from plugins/textmate/testData/lexer/php_vsc/html_css_after.php_vsc rename to plugins/textmate/tests/testData/lexer/php_vsc/html_css_after.php_vsc diff --git a/plugins/textmate/testData/lexer/php_vsc/slow.php_vsc b/plugins/textmate/tests/testData/lexer/php_vsc/slow.php_vsc similarity index 100% rename from plugins/textmate/testData/lexer/php_vsc/slow.php_vsc rename to plugins/textmate/tests/testData/lexer/php_vsc/slow.php_vsc diff --git a/plugins/textmate/testData/lexer/php_vsc/slow_after.php_vsc b/plugins/textmate/tests/testData/lexer/php_vsc/slow_after.php_vsc similarity index 100% rename from plugins/textmate/testData/lexer/php_vsc/slow_after.php_vsc rename to plugins/textmate/tests/testData/lexer/php_vsc/slow_after.php_vsc diff --git a/plugins/textmate/testData/lexer/python/dictionary.py b/plugins/textmate/tests/testData/lexer/python/dictionary.py similarity index 100% rename from plugins/textmate/testData/lexer/python/dictionary.py rename to plugins/textmate/tests/testData/lexer/python/dictionary.py diff --git a/plugins/textmate/testData/lexer/python/dictionary_after.py b/plugins/textmate/tests/testData/lexer/python/dictionary_after.py similarity index 100% rename from plugins/textmate/testData/lexer/python/dictionary_after.py rename to plugins/textmate/tests/testData/lexer/python/dictionary_after.py diff --git a/plugins/textmate/testData/lexer/python/selfpointer.py b/plugins/textmate/tests/testData/lexer/python/selfpointer.py similarity index 100% rename from plugins/textmate/testData/lexer/python/selfpointer.py rename to plugins/textmate/tests/testData/lexer/python/selfpointer.py diff --git a/plugins/textmate/testData/lexer/python/selfpointer_after.py b/plugins/textmate/tests/testData/lexer/python/selfpointer_after.py similarity index 100% rename from plugins/textmate/testData/lexer/python/selfpointer_after.py rename to plugins/textmate/tests/testData/lexer/python/selfpointer_after.py diff --git a/plugins/textmate/testData/lexer/rst/nested.rst b/plugins/textmate/tests/testData/lexer/rst/nested.rst similarity index 100% rename from plugins/textmate/testData/lexer/rst/nested.rst rename to plugins/textmate/tests/testData/lexer/rst/nested.rst diff --git a/plugins/textmate/testData/lexer/rst/nested_after.rst b/plugins/textmate/tests/testData/lexer/rst/nested_after.rst similarity index 100% rename from plugins/textmate/testData/lexer/rst/nested_after.rst rename to plugins/textmate/tests/testData/lexer/rst/nested_after.rst diff --git a/plugins/textmate/testData/lexer/ruby/comment_at_line_start.rb b/plugins/textmate/tests/testData/lexer/ruby/comment_at_line_start.rb similarity index 100% rename from plugins/textmate/testData/lexer/ruby/comment_at_line_start.rb rename to plugins/textmate/tests/testData/lexer/ruby/comment_at_line_start.rb diff --git a/plugins/textmate/testData/lexer/ruby/comment_at_line_start_after.rb b/plugins/textmate/tests/testData/lexer/ruby/comment_at_line_start_after.rb similarity index 100% rename from plugins/textmate/testData/lexer/ruby/comment_at_line_start_after.rb rename to plugins/textmate/tests/testData/lexer/ruby/comment_at_line_start_after.rb diff --git a/plugins/textmate/testData/lexer/shellscript/case.sh b/plugins/textmate/tests/testData/lexer/shellscript/case.sh similarity index 100% rename from plugins/textmate/testData/lexer/shellscript/case.sh rename to plugins/textmate/tests/testData/lexer/shellscript/case.sh diff --git a/plugins/textmate/testData/lexer/shellscript/case_after.sh b/plugins/textmate/tests/testData/lexer/shellscript/case_after.sh similarity index 100% rename from plugins/textmate/testData/lexer/shellscript/case_after.sh rename to plugins/textmate/tests/testData/lexer/shellscript/case_after.sh diff --git a/plugins/textmate/testData/lexer/shellscript/comment.sh b/plugins/textmate/tests/testData/lexer/shellscript/comment.sh similarity index 100% rename from plugins/textmate/testData/lexer/shellscript/comment.sh rename to plugins/textmate/tests/testData/lexer/shellscript/comment.sh diff --git a/plugins/textmate/testData/lexer/shellscript/comment_after.sh b/plugins/textmate/tests/testData/lexer/shellscript/comment_after.sh similarity index 100% rename from plugins/textmate/testData/lexer/shellscript/comment_after.sh rename to plugins/textmate/tests/testData/lexer/shellscript/comment_after.sh diff --git a/plugins/textmate/testData/lexer/shellscript/heredoc.sh b/plugins/textmate/tests/testData/lexer/shellscript/heredoc.sh similarity index 100% rename from plugins/textmate/testData/lexer/shellscript/heredoc.sh rename to plugins/textmate/tests/testData/lexer/shellscript/heredoc.sh diff --git a/plugins/textmate/testData/lexer/shellscript/heredoc_after.sh b/plugins/textmate/tests/testData/lexer/shellscript/heredoc_after.sh similarity index 100% rename from plugins/textmate/testData/lexer/shellscript/heredoc_after.sh rename to plugins/textmate/tests/testData/lexer/shellscript/heredoc_after.sh diff --git a/plugins/textmate/testData/lexer/smarty/injection.tpl_hack b/plugins/textmate/tests/testData/lexer/smarty/injection.tpl_hack similarity index 100% rename from plugins/textmate/testData/lexer/smarty/injection.tpl_hack rename to plugins/textmate/tests/testData/lexer/smarty/injection.tpl_hack diff --git a/plugins/textmate/testData/lexer/smarty/injection_after.tpl_hack b/plugins/textmate/tests/testData/lexer/smarty/injection_after.tpl_hack similarity index 100% rename from plugins/textmate/testData/lexer/smarty/injection_after.tpl_hack rename to plugins/textmate/tests/testData/lexer/smarty/injection_after.tpl_hack diff --git a/plugins/textmate/testData/lexer/terraform/module.tf b/plugins/textmate/tests/testData/lexer/terraform/module.tf similarity index 100% rename from plugins/textmate/testData/lexer/terraform/module.tf rename to plugins/textmate/tests/testData/lexer/terraform/module.tf diff --git a/plugins/textmate/testData/lexer/terraform/module_after.tf b/plugins/textmate/tests/testData/lexer/terraform/module_after.tf similarity index 100% rename from plugins/textmate/testData/lexer/terraform/module_after.tf rename to plugins/textmate/tests/testData/lexer/terraform/module_after.tf diff --git a/plugins/textmate/testData/lexer/terraform/split_scope_by_space.tf b/plugins/textmate/tests/testData/lexer/terraform/split_scope_by_space.tf similarity index 100% rename from plugins/textmate/testData/lexer/terraform/split_scope_by_space.tf rename to plugins/textmate/tests/testData/lexer/terraform/split_scope_by_space.tf diff --git a/plugins/textmate/testData/lexer/terraform/split_scope_by_space_after.tf b/plugins/textmate/tests/testData/lexer/terraform/split_scope_by_space_after.tf similarity index 100% rename from plugins/textmate/testData/lexer/terraform/split_scope_by_space_after.tf rename to plugins/textmate/tests/testData/lexer/terraform/split_scope_by_space_after.tf diff --git a/plugins/textmate/testData/lexer/turtle/local_inifinity_loop_protection.ttl b/plugins/textmate/tests/testData/lexer/turtle/local_inifinity_loop_protection.ttl similarity index 100% rename from plugins/textmate/testData/lexer/turtle/local_inifinity_loop_protection.ttl rename to plugins/textmate/tests/testData/lexer/turtle/local_inifinity_loop_protection.ttl diff --git a/plugins/textmate/testData/lexer/turtle/local_inifinity_loop_protection_after.ttl b/plugins/textmate/tests/testData/lexer/turtle/local_inifinity_loop_protection_after.ttl similarity index 100% rename from plugins/textmate/testData/lexer/turtle/local_inifinity_loop_protection_after.ttl rename to plugins/textmate/tests/testData/lexer/turtle/local_inifinity_loop_protection_after.ttl diff --git a/plugins/textmate/joni/tests/com/intellij/textmate/joni/JoniRegexFacadeTest.kt b/plugins/textmate/tests/tests/com/intellij/textmate/joni/JoniRegexFacadeTest.kt similarity index 100% rename from plugins/textmate/joni/tests/com/intellij/textmate/joni/JoniRegexFacadeTest.kt rename to plugins/textmate/tests/tests/com/intellij/textmate/joni/JoniRegexFacadeTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/TestUtil.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/TestUtil.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/TestUtil.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/TestUtil.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/TextMateAcceptanceTestCase.java b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/TextMateAcceptanceTestCase.java similarity index 97% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/TextMateAcceptanceTestCase.java rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/TextMateAcceptanceTestCase.java index 14259e6ef9a4..e756d6638a54 100644 --- a/plugins/textmate/tests/org/jetbrains/plugins/textmate/TextMateAcceptanceTestCase.java +++ b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/TextMateAcceptanceTestCase.java @@ -64,7 +64,7 @@ public abstract class TextMateAcceptanceTestCase extends BasePlatformTestCase { @Override protected String getBasePath() { - return "/plugins/textmate/testData" + getTestPath(); + return "/plugins/textmate/tests/testData" + getTestPath(); } @Override diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/bundles/BundleTypeTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/bundles/BundleTypeTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/bundles/BundleTypeTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/bundles/BundleTypeTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/cache/SLRUTextMateCacheTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateBraceMatcherTest.java b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateBraceMatcherTest.java similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateBraceMatcherTest.java rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateBraceMatcherTest.java diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateCommenterTest.java b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateCommenterTest.java similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateCommenterTest.java rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateCommenterTest.java diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateCompletionTest.java b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateCompletionTest.java similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateCompletionTest.java rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateCompletionTest.java diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateSnippetsCompletionTest.java b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateSnippetsCompletionTest.java similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateSnippetsCompletionTest.java rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateSnippetsCompletionTest.java diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateTypedHandlerTest.java b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateTypedHandlerTest.java similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/editor/TextMateTypedHandlerTest.java rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/editor/TextMateTypedHandlerTest.java diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/preferences/PreferencesTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/preferences/PreferencesTest.kt similarity index 98% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/preferences/PreferencesTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/preferences/PreferencesTest.kt index 0997fe02a531..094ce57f3867 100644 --- a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/preferences/PreferencesTest.kt +++ b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/preferences/PreferencesTest.kt @@ -95,7 +95,7 @@ class PreferencesTest { val preferencesRegistry = loadPreferences(TestUtil.RESTRUCTURED_TEXT) val preferences: Preferences = mergeAll(preferencesRegistry.getPreferences(TestUtil.scopeFromString("source.rst"))) assertNotNull(preferences.onEnterRules) - assertFalse(preferences.onEnterRules.isEmpty()) + assertFalse(preferences.onEnterRules!!.isEmpty()) } private fun loadPreferences(bundleName: String): PreferencesRegistry { @@ -144,7 +144,7 @@ class PreferencesTest { } } if (preference.onEnterRules != null) { - onEnterRules.addAll(preference.onEnterRules) + onEnterRules.addAll(preference.onEnterRules!!) } } return Preferences("", diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/preferences/ShellVariablesTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/preferences/ShellVariablesTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/preferences/ShellVariablesTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/preferences/ShellVariablesTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/preferences/TextMateSnippetsLoadingTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/preferences/TextMateSnippetsLoadingTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/preferences/TextMateSnippetsLoadingTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/preferences/TextMateSnippetsLoadingTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerPerformanceTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerPerformanceTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerPerformanceTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerPerformanceTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerTestCase.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerTestCase.kt similarity index 98% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerTestCase.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerTestCase.kt index 2bac5ef32d79..0827545fea24 100644 --- a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerTestCase.kt +++ b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/TextMateLexerTestCase.kt @@ -23,7 +23,7 @@ import java.io.File import java.nio.charset.StandardCharsets abstract class TextMateLexerTestCase { - private val TEST_DATA_BASE_DIR: String = "${PlatformTestUtil.getCommunityPath()}/plugins/textmate/testData/lexer" + private val TEST_DATA_BASE_DIR: String = "${PlatformTestUtil.getCommunityPath()}/plugins/textmate/tests/testData/lexer" fun doTest(beforePath: String, afterPath: String) { val beforeFile = File(TEST_DATA_BASE_DIR, "$testDirRelativePath/$beforePath") diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/AstroLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/AstroLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/AstroLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/AstroLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/BatLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/BatLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/BatLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/BatLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ColdFusionLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ColdFusionLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ColdFusionLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ColdFusionLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/CppLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/CppLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/CppLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/CppLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/DockerLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/DockerLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/DockerLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/DockerLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ElixirLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ElixirLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ElixirLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ElixirLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/FSharpLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/FSharpLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/FSharpLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/FSharpLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/GitLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/GitLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/GitLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/GitLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/GoLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/GoLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/GoLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/GoLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/HtmlVscLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/HtmlVscLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/HtmlVscLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/HtmlVscLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/JavaLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/JavaLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/JavaLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/JavaLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/LatexLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/LatexLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/LatexLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/LatexLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/LogLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/LogLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/LogLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/LogLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MakefileLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MakefileLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MakefileLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MakefileLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownBloggingLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownBloggingLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownBloggingLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownBloggingLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownHtmlLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownHtmlLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownHtmlLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownHtmlLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownSublimeLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownSublimeLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownSublimeLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownSublimeLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownVscLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownVscLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownVscLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/MarkdownVscLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PerlLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PerlLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PerlLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PerlLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpHtmlLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpHtmlLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpHtmlLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpHtmlLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpVscLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpVscLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpVscLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PhpVscLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PythonLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PythonLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PythonLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/PythonLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/RstLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/RstLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/RstLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/RstLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/RubyLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/RubyLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/RubyLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/RubyLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ShellscriptLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ShellscriptLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ShellscriptLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/ShellscriptLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/SmartyPhpLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/SmartyPhpLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/SmartyPhpLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/SmartyPhpLexerTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtilsTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtilsTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtilsTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/SyntaxMatchUtilsTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/TerraformLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/TerraformLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/TerraformLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/TerraformLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/TurtleLexerTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/TurtleLexerTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/TurtleLexerTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/lexer/TurtleLexerTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/regex/CachingRegexFacadeTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/regex/CachingRegexFacadeTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/regex/CachingRegexFacadeTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/regex/CachingRegexFacadeTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/regex/CaffeineCachingRegexFacadeTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/regex/CaffeineCachingRegexFacadeTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/regex/CaffeineCachingRegexFacadeTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/regex/CaffeineCachingRegexFacadeTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/regex/RememberLastMatchRegexFacadeTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/regex/RememberLastMatchRegexFacadeTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/regex/RememberLastMatchRegexFacadeTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/regex/RememberLastMatchRegexFacadeTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCachingSelectorWeigherTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCachingSelectorWeigherTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCachingSelectorWeigherTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCachingSelectorWeigherTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCaffeineSelectorWeigherTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCaffeineSelectorWeigherTest.kt similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCaffeineSelectorWeigherTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateCaffeineSelectorWeigherTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherImplTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherImplTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherImplTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherImplTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherTestCase.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherTestCase.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherTestCase.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/language/syntax/selector/TextMateSelectorWeigherTestCase.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/plist/JsonOrXmlPlistReaderTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/plist/JsonOrXmlPlistReaderTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/plist/JsonOrXmlPlistReaderTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/plist/JsonOrXmlPlistReaderTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/plist/JsonPlistReaderTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/plist/JsonPlistReaderTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/plist/JsonPlistReaderTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/plist/JsonPlistReaderTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/plist/XmlPlistReaderTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/plist/XmlPlistReaderTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/plist/XmlPlistReaderTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/plist/XmlPlistReaderTest.kt diff --git a/plugins/textmate/core/tests/org/jetbrains/plugins/textmate/regex/RegexFacadeTest.kt b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/regex/RegexFacadeTest.kt similarity index 100% rename from plugins/textmate/core/tests/org/jetbrains/plugins/textmate/regex/RegexFacadeTest.kt rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/regex/RegexFacadeTest.kt diff --git a/plugins/textmate/tests/org/jetbrains/plugins/textmate/spellchecker/TextMateSpellcheckingTest.java b/plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/spellchecker/TextMateSpellcheckingTest.java similarity index 100% rename from plugins/textmate/tests/org/jetbrains/plugins/textmate/spellchecker/TextMateSpellcheckingTest.java rename to plugins/textmate/tests/tests/org/jetbrains/plugins/textmate/spellchecker/TextMateSpellcheckingTest.java diff --git a/plugins/textmate/core/testsMultiplatform/org/jetbrains/plugins/textmate/TestUtilMultiplatform.kt b/plugins/textmate/tests/testsMultiplatform/org/jetbrains/plugins/textmate/TestUtilMultiplatform.kt similarity index 94% rename from plugins/textmate/core/testsMultiplatform/org/jetbrains/plugins/textmate/TestUtilMultiplatform.kt rename to plugins/textmate/tests/testsMultiplatform/org/jetbrains/plugins/textmate/TestUtilMultiplatform.kt index 057dd9d17849..ee5b8a242851 100644 --- a/plugins/textmate/core/testsMultiplatform/org/jetbrains/plugins/textmate/TestUtilMultiplatform.kt +++ b/plugins/textmate/tests/testsMultiplatform/org/jetbrains/plugins/textmate/TestUtilMultiplatform.kt @@ -17,7 +17,7 @@ import kotlin.io.path.pathString object TestUtilMultiplatform { fun getBundleDirectoryPath(bundleName: String): String { - val bundleDirectory = Path.of(PathManager.getCommunityHomePath()).resolve("plugins/textmate/testData/bundles").resolve(bundleName) + val bundleDirectory = Path.of(PathManager.getCommunityHomePath()).resolve("plugins/textmate/tests/testData/bundles").resolve(bundleName) return if (bundleDirectory.exists()) { bundleDirectory } diff --git a/plugins/textmate/core/testsMultiplatform/org/jetbrains/plugins/textmate/plist/XmlPlistReaderForTests.kt b/plugins/textmate/tests/testsMultiplatform/org/jetbrains/plugins/textmate/plist/XmlPlistReaderForTests.kt similarity index 100% rename from plugins/textmate/core/testsMultiplatform/org/jetbrains/plugins/textmate/plist/XmlPlistReaderForTests.kt rename to plugins/textmate/tests/testsMultiplatform/org/jetbrains/plugins/textmate/plist/XmlPlistReaderForTests.kt diff --git a/python/BUILD.bazel b/python/BUILD.bazel index 5fd3bb0684d2..69e85ebccce4 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -90,7 +90,7 @@ jvm_library( "//plugins/sh", "//plugins/terminal/sh", "//plugins/IntelliLang/xml-support:xml-langInjection", - "//plugins/textmate", + "//plugins/textmate/plugin", "//plugins/completion-ml-ranking-models", "//plugins/emojipicker", "//plugins/grazie", @@ -127,8 +127,6 @@ jvm_library( "//plugins/markdown/plugin:plugin-main", "//plugins/sh", "//plugins/IntelliLang/xml-support:xml-langInjection", - "//plugins/textmate", - "//plugins/textmate:textmate_test_lib", "//plugins/color-schemes/monokai-color-scheme:color-scheme-monokai", "//plugins/color-schemes/twilight-color-scheme:color-scheme-twilight", "//plugins/color-schemes/warm-neon-color-scheme:color-scheme-warmNeon", @@ -152,6 +150,7 @@ jvm_library( "//plugins/completion-ml-ranking", "//plugins/stats-collector", "//plugins/terminal/sh", + "//plugins/textmate/plugin", "//plugins/completion-ml-ranking-models", "//plugins/emojipicker", "//plugins/grazie", diff --git a/python/build/plugin-list.txt b/python/build/plugin-list.txt index 946a4e394088..d59059c32d8d 100644 --- a/python/build/plugin-list.txt +++ b/python/build/plugin-list.txt @@ -20,7 +20,7 @@ intellij.sh intellij.statsCollector intellij.tasks.core intellij.terminal -intellij.textmate +intellij.textmate.plugin intellij.toml intellij.vcs.git intellij.vcs.hg diff --git a/python/intellij.pycharm.community.main.iml b/python/intellij.pycharm.community.main.iml index 3443f4d3b700..1136a5735020 100644 --- a/python/intellij.pycharm.community.main.iml +++ b/python/intellij.pycharm.community.main.iml @@ -33,7 +33,7 @@ - +