Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
.idea/workspace.xml
.idea/tasks.xml
/out
/build
/.gradle
/.intellijPlatform
72 changes: 72 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
plugins {
java
id("org.jetbrains.intellij.platform") version "2.13.1"
}

group = providers.gradleProperty("pluginGroup").get()
version = providers.gradleProperty("pluginVersion").get()

repositories {
mavenCentral()
intellijPlatform {
defaultRepositories()
}
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(26)
}
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

sourceSets {
main {
java.srcDirs("tmc-plugin-intellij/src/main/java")
resources.srcDirs("tmc-plugin-intellij/resources")
}
test {
java.srcDirs("tmc-plugin-intellij/src/test/java")
}
}

dependencies {
intellijPlatform {
intellijIdea(providers.gradleProperty("platformVersion"))
bundledPlugin("com.intellij.java")
}

// tmc-core and all transitive dependencies are vendored under libs/
// because maven.testmycode.net is no longer reachable.
implementation(fileTree("libs") { include("*.jar") })

// Apache Ant is required by fi.helsinki.cs.tmc.langs.util.ProjectType
// (BuildException referenced from <clinit>) but is not vendored under libs/.
implementation("org.apache.ant:ant:1.10.14")

testImplementation("junit:junit:4.13.2")
testImplementation("org.mockito:mockito-core:5.14.0")
}

intellijPlatform {
pluginConfiguration {
ideaVersion {
sinceBuild = providers.gradleProperty("pluginSinceBuild")
untilBuild = provider { null }
}
}

pluginVerification {
ides {
recommended()
}
}
}

tasks {
withType<JavaCompile> {
options.release = 21
options.encoding = "UTF-8"
}
}
9 changes: 9 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
pluginGroup = fi.helsinki.cs.tmc.intellij
pluginName = tmc-intellij
pluginVersion = 2.1.0
pluginSinceBuild = 261
platformType = IC
platformVersion = 2026.1
org.gradle.jvmargs=-Xmx2g -XX:+UseG1GC
org.gradle.caching=true
org.gradle.parallel=true
Binary file added libs/aether-api-1.0.2.v20150114.jar
Binary file not shown.
Binary file added libs/aether-connector-basic-1.0.2.v20150114.jar
Binary file not shown.
Binary file added libs/aether-impl-1.0.2.v20150114.jar
Binary file not shown.
Binary file added libs/aether-spi-1.0.2.v20150114.jar
Binary file not shown.
Binary file added libs/aether-transport-wagon-1.0.2.v20150114.jar
Binary file not shown.
Binary file added libs/aether-util-1.0.2.v20150114.jar
Binary file not shown.
Binary file added libs/antlr-2.7.7.jar
Binary file not shown.
Binary file added libs/antlr4-runtime-4.5.2-1.jar
Binary file not shown.
Binary file added libs/aopalliance-1.0.jar
Binary file not shown.
Binary file added libs/backport-util-concurrent-3.1.jar
Binary file not shown.
Binary file added libs/cdi-api-1.0.jar
Binary file not shown.
Binary file added libs/checkstyle-6.17-tmc-20170213.093316-4.jar
Binary file not shown.
Binary file added libs/classworlds-1.1-alpha-2.jar
Binary file not shown.
Binary file added libs/commons-beanutils-1.9.2.jar
Binary file not shown.
Binary file added libs/commons-chain-1.1.jar
Binary file not shown.
Binary file added libs/commons-cli-1.2.jar
Binary file not shown.
Binary file added libs/commons-codec-1.10.jar
Binary file not shown.
Binary file added libs/commons-collections-3.2.1.jar
Binary file not shown.
Binary file added libs/commons-compress-1.14.jar
Binary file not shown.
Binary file added libs/commons-digester-1.6.jar
Binary file not shown.
Binary file added libs/commons-io-2.4.jar
Binary file not shown.
Binary file added libs/commons-lang-2.1.jar
Binary file not shown.
Binary file added libs/commons-lang3-3.5.jar
Binary file not shown.
Binary file added libs/commons-logging-1.2.jar
Binary file not shown.
Binary file added libs/commons-validator-1.3.1.jar
Binary file not shown.
Binary file added libs/core-0.10.4-SNAPSHOT.jar
Binary file not shown.
Binary file added libs/dom4j-1.1.jar
Binary file not shown.
Binary file added libs/doxia-core-1.2.jar
Binary file not shown.
Binary file added libs/doxia-decoration-model-1.4.jar
Binary file not shown.
Binary file added libs/doxia-integration-tools-1.6.jar
Binary file not shown.
Binary file added libs/doxia-logging-api-1.4.jar
Binary file not shown.
Binary file added libs/doxia-module-fml-1.4.jar
Binary file not shown.
Binary file added libs/doxia-module-xhtml-1.4.jar
Binary file not shown.
Binary file added libs/doxia-sink-api-1.4.jar
Binary file not shown.
Binary file added libs/doxia-site-renderer-1.4.jar
Binary file not shown.
Binary file added libs/gson-2.3.1.jar
Binary file not shown.
Binary file added libs/guava-19.0.jar
Binary file not shown.
Binary file added libs/hamcrest-core-1.3.jar
Binary file not shown.
Binary file added libs/httpclient-4.5.3.jar
Binary file not shown.
Binary file added libs/httpcore-4.4.6.jar
Binary file not shown.
Binary file added libs/httpmime-4.3.5.jar
Binary file not shown.
Binary file added libs/jackson-annotations-2.4.0.jar
Binary file not shown.
Binary file added libs/jackson-core-2.4.1.1.jar
Binary file not shown.
Binary file added libs/jackson-core-asl-1.9.13.jar
Binary file not shown.
Binary file added libs/jackson-databind-2.4.1.3.jar
Binary file not shown.
Binary file added libs/jackson-dataformat-yaml-2.4.1.jar
Binary file not shown.
Binary file added libs/jackson-mapper-asl-1.9.13.jar
Binary file not shown.
Binary file added libs/javax.inject-1.jar
Binary file not shown.
Binary file added libs/json-20140107.jar
Binary file not shown.
Binary file added libs/jsoup-1.7.2.jar
Binary file not shown.
Binary file added libs/jsr250-api-1.0.jar
Binary file not shown.
Binary file added libs/jsr305-2.0.1.jar
Binary file not shown.
Binary file added libs/junit-4.11.jar
Binary file not shown.
Binary file added libs/maven-aether-provider-3.3.3.jar
Binary file not shown.
Binary file added libs/maven-artifact-2.2.1.jar
Binary file not shown.
Binary file added libs/maven-artifact-manager-2.2.1.jar
Binary file not shown.
Binary file added libs/maven-builder-support-3.3.3.jar
Binary file not shown.
Binary file added libs/maven-checkstyle-plugin-2.17.jar
Binary file not shown.
Binary file added libs/maven-compat-3.3.3.jar
Binary file not shown.
Binary file added libs/maven-core-3.3.3.jar
Binary file not shown.
Binary file added libs/maven-embedder-3.3.3.jar
Binary file not shown.
Binary file added libs/maven-model-2.2.1.jar
Binary file not shown.
Binary file added libs/maven-model-builder-3.3.3.jar
Binary file not shown.
Binary file added libs/maven-plugin-api-2.2.1.jar
Binary file not shown.
Binary file added libs/maven-plugin-descriptor-2.2.1.jar
Binary file not shown.
Binary file added libs/maven-plugin-registry-2.2.1.jar
Binary file not shown.
Binary file added libs/maven-profile-2.2.1.jar
Binary file not shown.
Binary file added libs/maven-project-2.2.1.jar
Binary file not shown.
Binary file added libs/maven-reporting-api-3.0.jar
Binary file not shown.
Binary file added libs/maven-reporting-impl-2.3.jar
Binary file not shown.
Binary file added libs/maven-repository-metadata-3.3.3.jar
Binary file not shown.
Binary file added libs/maven-settings-3.3.3.jar
Binary file not shown.
Binary file added libs/maven-settings-builder-3.3.3.jar
Binary file not shown.
Binary file added libs/maven-shared-utils-0.6.jar
Binary file not shown.
Binary file added libs/org.apache.oltu.oauth2.client-1.0.2.jar
Binary file not shown.
Binary file added libs/org.apache.oltu.oauth2.common-1.0.2.jar
Binary file not shown.
Binary file added libs/org.eclipse.sisu.inject-0.3.1.jar
Binary file not shown.
Binary file added libs/org.eclipse.sisu.plexus-0.3.1.jar
Binary file not shown.
Binary file added libs/oro-2.0.8.jar
Binary file not shown.
Binary file added libs/picocontainer-2.15.jar
Binary file not shown.
Binary file added libs/plexus-cipher-1.7.jar
Binary file not shown.
Binary file added libs/plexus-classworlds-2.5.2.jar
Binary file not shown.
Binary file added libs/plexus-component-annotations-1.5.5.jar
Binary file not shown.
Binary file not shown.
Binary file added libs/plexus-i18n-1.0-beta-7.jar
Binary file not shown.
Binary file added libs/plexus-interpolation-1.21.jar
Binary file not shown.
Binary file added libs/plexus-resources-1.0.1.jar
Binary file not shown.
Binary file added libs/plexus-sec-dispatcher-1.3.jar
Binary file not shown.
Binary file added libs/plexus-utils-3.0.20.jar
Binary file not shown.
Binary file added libs/plexus-velocity-1.1.8.jar
Binary file not shown.
Binary file added libs/sisu-guice-3.2.5-no_aop.jar
Binary file not shown.
Binary file added libs/snakeyaml-1.5.jar
Binary file not shown.
Binary file added libs/sslext-1.2-0.jar
Binary file not shown.
Binary file added libs/struts-core-1.3.8.jar
Binary file not shown.
Binary file added libs/struts-taglib-1.3.8.jar
Binary file not shown.
Binary file added libs/struts-tiles-1.3.8.jar
Binary file not shown.
Binary file added libs/system-rules-1.12.1.jar
Binary file not shown.
Binary file not shown.
Binary file added libs/tmc-junit-runner-0.2.5.jar
Binary file not shown.
Binary file added libs/tmc-langs-abstraction-1.0.0.jar
Binary file not shown.
Binary file not shown.
Binary file added libs/tmc-langs-java-0.7.9-20180418.135635-1.jar
Binary file not shown.
Binary file added libs/tmc-langs-make-0.7.9-20180418.135700-1.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added libs/tmc-langs-qmake-0.7.9-20180418.135727-1.jar
Binary file not shown.
Binary file added libs/tmc-langs-r-0.7.9-20180418.135738-1.jar
Binary file not shown.
Binary file added libs/tmc-langs-util-0.7.9-20180418.135748-1.jar
Binary file not shown.
Binary file added libs/truth-0.28.jar
Binary file not shown.
Binary file added libs/velocity-1.5.jar
Binary file not shown.
Binary file added libs/velocity-tools-2.0.jar
Binary file not shown.
Binary file added libs/wagon-http-2.9.jar
Binary file not shown.
Binary file added libs/wagon-http-shared-2.9.jar
Binary file not shown.
Binary file added libs/wagon-provider-api-2.9.jar
Binary file not shown.
Binary file added libs/xercesImpl-2.9.1.jar
Binary file not shown.
Binary file added libs/xml-apis-1.3.04.jar
Binary file not shown.
204 changes: 0 additions & 204 deletions pom.xml

This file was deleted.

2 changes: 0 additions & 2 deletions prepare-build.sh

This file was deleted.

1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "tmc-intellij"
15 changes: 6 additions & 9 deletions tmc-plugin-intellij/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<idea-plugin>
<id>fi.helsinki.cs.tmc</id>
<name>TMC Plugin for Intellij</name>
<version>2.0.3</version>
<name>TMC - Test My Code</name>
<version>2.1.0</version>
<vendor email="" url="https://github.com/testmycode/tmc-intellij"> TMC IntelliJ team @ Github</vendor>

<description><![CDATA[
Expand All @@ -21,14 +21,11 @@
]]>
</change-notes>

<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
<idea-version since-build="141.0"/>
<!-- please see https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html for description -->
<idea-version since-build="261"/>

<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
on how to target different products -->
<!-- uncomment to enable plugin in all products
<depends>com.intellij.modules.lang</depends>
-->
<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.modules.java</depends>

<extensions defaultExtensionNs="com.intellij">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void openToolWindow(Project project) {
public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
logger.info("Creating tool window content. @OpenToolWindowAction");
ProjectListWindow window = new ProjectListWindow();
ContentFactory cf = ContentFactory.SERVICE.getInstance();
ContentFactory cf = ContentFactory.getInstance();
Content content = cf.createContent(window.getBasePanel(), "", true);
toolWindow.getContentManager().addContent(content);
ProjectListManagerHolder.get().addWindow(window);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
import com.intellij.openapi.editor.actionSystem.TypedActionHandler;
import com.intellij.openapi.progress.util.ProgressWindow;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.startup.StartupActivity;
import com.intellij.openapi.startup.ProjectActivity;
import com.intellij.openapi.wm.ToolWindowManager;

import fi.helsinki.cs.tmc.intellij.ui.login.LoginDialog;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -35,12 +36,24 @@
/**
* The actions to be executed on project startup defined in plugin.xml exercises group on line
* &lt;postStartupActivity implementation ="fi.helsinki.cs.tmc.intellij.actions.StartupEvent"&gt;
*
* <p>Implements the modern {@link ProjectActivity} contract. The {@code execute} method
* is the suspend function generated from Kotlin; we delegate to {@link #runActivity(Project)}
* for the actual logic.
*/
public class StartupEvent implements StartupActivity {
public class StartupEvent implements ProjectActivity {

private static final Logger logger = LoggerFactory.getLogger(StartupEvent.class);

@Nullable
@Override
public Object execute(
@NotNull Project project,
@NotNull kotlin.coroutines.Continuation<? super kotlin.Unit> continuation) {
runActivity(project);
return kotlin.Unit.INSTANCE;
}

public void runActivity(@NotNull Project project) {

logger.info("Opening project {} and running startup actions. @StartupEvent", project);
Expand Down
Loading