-
Notifications
You must be signed in to change notification settings - Fork 11
feat(#10): Add same Textmate Bundle as VSCode-Extension #11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
marfranke
wants to merge
2
commits into
usebruno:main
Choose a base branch
from
marfranke:feature/textmate-bundle
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,22 +13,38 @@ repositories { | |
| // Configure Gradle IntelliJ Plugin | ||
| // Read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html | ||
| intellij { | ||
| version.set("2022.1.4") | ||
| version.set("2024.1") | ||
| type.set("IC") // Target IDE Platform | ||
|
|
||
| plugins.set(listOf(/* Plugin Dependencies */)) | ||
| plugins.set( | ||
| listOf( | ||
| "org.jetbrains.plugins.textmate" | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| tasks { | ||
| val copyVscodeTextMateBundle by registering(Copy::class) { | ||
| from("../vscode/") | ||
| include("package.json") | ||
| include("language-configuration.json") | ||
| include("syntaxes/bruno.tmLanguage.json") | ||
| into(layout.buildDirectory.dir("resources/main/textmate/bruno-bundle")) | ||
| } | ||
|
|
||
| processResources { | ||
| dependsOn(copyVscodeTextMateBundle) | ||
| } | ||
|
|
||
| // Set the JVM compatibility versions | ||
| withType<JavaCompile> { | ||
| sourceCompatibility = "11" | ||
| targetCompatibility = "11" | ||
| } | ||
|
|
||
| patchPluginXml { | ||
| sinceBuild.set("221") | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's not compatible with this version anymore ? |
||
| untilBuild.set("231.*") | ||
| sinceBuild.set("241") | ||
| untilBuild.set("241.*") | ||
| } | ||
|
|
||
| signPlugin { | ||
|
|
||
42 changes: 0 additions & 42 deletions
42
packages/intellij/src/main/java/com/usebruno/plugin/bruno/styles/BruFileType.java
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
packages/intellij/src/main/java/com/usebruno/plugin/bruno/styles/CustomFileTypeFactory.java
This file was deleted.
Oops, something went wrong.
35 changes: 35 additions & 0 deletions
35
...ages/intellij/src/main/java/com/usebruno/plugin/textmate/BrunoTextMateBundleProvider.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package com.usebruno.plugin.textmate; | ||
|
|
||
| import com.intellij.openapi.application.PathManager; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.plugins.textmate.api.TextMateBundleProvider; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.net.URL; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| public class BrunoTextMateBundleProvider implements TextMateBundleProvider { | ||
| @NotNull | ||
| @Override | ||
| public List<PluginBundle> getBundles() { | ||
| try { | ||
| Path brunoBundleTmpDir = Files.createTempDirectory(Path.of(PathManager.getTempPath()), "textmate-bruno"); | ||
| for (String fileToCopy : List.of("package.json", "language-configuration.json", "syntaxes/bruno.tmLanguage.json")) { | ||
| URL resource = BrunoTextMateBundleProvider.class.getClassLoader().getResource("textmate/bruno-bundle/" + fileToCopy); | ||
| try (InputStream resourceStream = Objects.requireNonNull(resource).openStream()) { | ||
| Path target = brunoBundleTmpDir.resolve(fileToCopy); | ||
| Files.createDirectories(target.getParent()); | ||
| Files.copy(resourceStream, target); | ||
| } | ||
| } | ||
| PluginBundle brunoBundle = new PluginBundle("Bruno", Objects.requireNonNull(brunoBundleTmpDir)); | ||
| return List.of(brunoBundle); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 0 additions & 45 deletions
45
packages/intellij/src/main/resources/bruno.tmLanguage.json
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably it would be fine to upgrade it to v17 as there is the following warning:
The Java configuration specifies sourceCompatibility=11 but IntelliJ Platform 2024.1 requires sourceCompatibility=17.during building plugin.