Skip to content

Commit

Permalink
renamespace
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronFeledy committed Jun 25, 2024
1 parent 9b3e836 commit ea318e6
Show file tree
Hide file tree
Showing 23 changed files with 149 additions and 135 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Lando Plugin for JetBrains IDEs

![Build](https://github.com/AaronFeledy/lando-intellij-plugin/workflows/Build/badge.svg)
![Build](https://github.com/4lando/intellij-plugin/workflows/Build/badge.svg)
[![Version](https://img.shields.io/jetbrains/plugin/v/PLUGIN_ID.svg)](https://plugins.jetbrains.com/plugin/PLUGIN_ID)
[![Downloads](https://img.shields.io/jetbrains/plugin/d/PLUGIN_ID.svg)](https://plugins.jetbrains.com/plugin/PLUGIN_ID)

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html

pluginGroup = com.github.aaronfeledy.landointellijplugin
pluginGroup = dev._4lando.intellij
pluginName = Lando Local Development Environment
pluginRepositoryUrl = https://github.com/AaronFeledy/lando-intellij-plugin
pluginRepositoryUrl = https://github.com/4lando/intellij-plugin
# SemVer format -> https://semver.org
pluginVersion = 0.0.1

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}

rootProject.name = "Lando Local Development Environment"
rootProject.name = "lando-intellij"

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.aaronfeledy.landointellijplugin
package dev._4lando.intellij

import com.intellij.DynamicBundle
import org.jetbrains.annotations.NonNls
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.aaronfeledy.landointellijplugin
package dev._4lando.intellij

/**
* Data class representing the service data for a Lando application.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.github.aaronfeledy.landointellijplugin
package dev._4lando.intellij

import com.github.aaronfeledy.landointellijplugin.services.LandoProjectService
import com.intellij.execution.process.ProcessHandler
import com.intellij.execution.ui.ConsoleViewContentType
import com.github.aaronfeledy.landointellijplugin.ui.console.JeditermConsoleView
import com.intellij.openapi.project.Project
import dev._4lando.intellij.services.LandoProjectService
import dev._4lando.intellij.ui.console.JeditermConsoleView
import java.io.File
import java.io.OutputStream

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package com.github.aaronfeledy.landointellijplugin.actions

import com.intellij.openapi.actionSystem.ActionGroup
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.DefaultActionGroup

/**
* Determines the Lando menu group Action times. LandoActionGroup] is based on [ActionGroup] because menu
* children are determined on rules other than just positional constraints.
*
* @see ActionGroup
*/
class LandoActionGroup : DefaultActionGroup() {
/**
* Returns an array of menu actions for the group.
*
* @param e Event received when the associated group-id menu is chosen.
* @return AnAction[] An instance of [AnAction], in this case containing a single instance of the
* [LandoStartAction] class.
*/
package dev._4lando.intellij.actions

import com.intellij.openapi.actionSystem.ActionGroup
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.DefaultActionGroup

/**
* Determines the Lando menu group Action times. LandoActionGroup] is based on [ActionGroup] because menu
* children are determined on rules other than just positional constraints.
*
* @see ActionGroup
*/
class LandoActionGroup : DefaultActionGroup() {
/**
* Returns an array of menu actions for the group.
*
* @param e Event received when the associated group-id menu is chosen.
* @return AnAction[] An instance of [AnAction], in this case containing a single instance of the
* [LandoStartAction] class.
*/
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.github.aaronfeledy.landointellijplugin.actions
package dev._4lando.intellij.actions

import com.github.aaronfeledy.landointellijplugin.LandoExec
import com.intellij.openapi.actionSystem.ActionUpdateThread
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages
import dev._4lando.intellij.LandoExec
import java.io.BufferedReader
import java.io.File
import java.io.InputStreamReader
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.github.aaronfeledy.landointellijplugin.config
package dev._4lando.intellij.config

import com.github.aaronfeledy.landointellijplugin.LandoBundle
import com.intellij.openapi.fileTypes.LanguageFileType
import com.intellij.openapi.fileTypes.ex.FileTypeIdentifiableByVirtualFile
import com.intellij.openapi.vfs.VirtualFile
import dev._4lando.intellij.LandoBundle
import icons.LandoIcons
import org.jetbrains.yaml.YAMLLanguage
import javax.swing.Icon
import org.jetbrains.yaml.YAMLLanguage

/**
* This class represents the file type for Landofile (.lando.yml) configuration files.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.github.aaronfeledy.landointellijplugin.config
package dev._4lando.intellij.config

import com.github.aaronfeledy.landointellijplugin.LandoBundle
import com.intellij.lang.javascript.EmbeddedJsonSchemaFileProvider
import com.intellij.openapi.project.DumbAware
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import com.jetbrains.jsonSchema.extension.JsonSchemaFileProvider
import com.jetbrains.jsonSchema.extension.JsonSchemaProviderFactory
import dev._4lando.intellij.LandoBundle

/**
* This class is responsible for providing the JSON schema for Lando files.
Expand All @@ -18,7 +18,7 @@ class LandofileJsonSchemaProviderFactory : JsonSchemaProviderFactory, DumbAware
companion object {
const val SCHEMA_FILE_NAME: String = "landofile-spec.json"
const val SCHEMA_FILE_DIR: String = "/"
const val SCHEMA_FILE_URL: String = "https://raw.githubusercontent.com/AaronFeledy/lando-intellij-plugin/src/main/resources/landofile-spec.json"
const val SCHEMA_FILE_URL: String = "https://raw.githubusercontent.com/4lando/intellij-plugin/src/main/resources/landofile-spec.json"
}

override fun getProviders(project: Project): List<JsonSchemaFileProvider> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.github.aaronfeledy.landointellijplugin.listeners
package dev._4lando.intellij.listeners

import com.github.aaronfeledy.landointellijplugin.services.LandoProjectService
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ProjectManagerListener
import dev._4lando.intellij.services.LandoProjectService

class LandoProjectManagerListener : ProjectManagerListener {
override fun projectOpened(project: Project) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package dev._4lando.intellij.listeners

interface LandoStatusListener {
fun statusChanged()
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.github.aaronfeledy.landointellijplugin.services
package dev._4lando.intellij.services

import com.github.aaronfeledy.landointellijplugin.LandoExec
import com.github.aaronfeledy.landointellijplugin.ServiceData
import com.github.aaronfeledy.landointellijplugin.listeners.LandoProjectManagerListener
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.intellij.execution.process.ProcessHandler
import com.intellij.openapi.Disposable
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.components.Service
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.guessProjectDir
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.ConcurrencyUtil
import com.intellij.util.messages.Topic
import dev._4lando.intellij.LandoExec
import dev._4lando.intellij.ServiceData
import dev._4lando.intellij.listeners.LandoProjectManagerListener
import java.util.*
import java.util.concurrent.ScheduledExecutorService
import java.util.concurrent.TimeUnit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package com.github.aaronfeledy.landointellijplugin.services
package dev._4lando.intellij.services

import com.github.aaronfeledy.landointellijplugin.LandoExec
import com.github.aaronfeledy.landointellijplugin.listeners.LandoStatusListener
import com.github.aaronfeledy.landointellijplugin.ui.console.JeditermConsoleView
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.intellij.openapi.Disposable
Expand All @@ -12,8 +9,11 @@ import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.ProjectManager
import com.intellij.util.messages.Topic
import com.pty4j.PtyProcessBuilder
import kotlinx.coroutines.sync.Mutex
import dev._4lando.intellij.LandoExec
import dev._4lando.intellij.listeners.LandoStatusListener
import dev._4lando.intellij.ui.console.JeditermConsoleView
import java.util.*
import kotlinx.coroutines.sync.Mutex

@Service()
class LandoStatusService() : Disposable {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.github.aaronfeledy.landointellijplugin.ui
package dev._4lando.intellij.ui

import com.github.aaronfeledy.landointellijplugin.LandoBundle
import com.github.aaronfeledy.landointellijplugin.services.LandoStatusService
import com.github.aaronfeledy.landointellijplugin.ui.console.JeditermConsoleView
import com.intellij.openapi.project.Project
import com.intellij.openapi.wm.ToolWindow
import com.intellij.openapi.wm.ToolWindowFactory
import com.intellij.openapi.wm.impl.content.ToolWindowContentUi
import com.intellij.ui.content.ContentFactory
import dev._4lando.intellij.LandoBundle
import dev._4lando.intellij.services.LandoStatusService
import dev._4lando.intellij.ui.console.JeditermConsoleView


class LandoToolWindowFactory : ToolWindowFactory {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.aaronfeledy.landointellijplugin.ui.console
package dev._4lando.intellij.ui.console

import com.intellij.execution.filters.Filter
import com.intellij.execution.filters.HyperlinkInfo
Expand All @@ -17,13 +17,13 @@ import com.intellij.terminal.JBTerminalWidget
import com.jediterm.terminal.*
import com.jediterm.terminal.emulator.JediEmulator
import com.jediterm.terminal.model.JediTerminal
import org.apache.commons.io.input.buffer.CircularByteBuffer
import java.io.InputStream
import java.io.InputStreamReader
import java.io.Reader
import java.nio.charset.Charset
import javax.swing.JComponent
import kotlin.math.min
import org.apache.commons.io.input.buffer.CircularByteBuffer

private const val BUFFER_SIZE = 100000

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.github.aaronfeledy.landointellijplugin.ui.console
package dev._4lando.intellij.ui.console

import com.jediterm.terminal.TtyConnector
import java.nio.charset.Charset
import java.nio.charset.StandardCharsets

class LandoTtyConnector(private val process: Process,
private val consoleView: JeditermConsoleView) : TtyConnector {
private val consoleView: JeditermConsoleView
) : TtyConnector {

var charset: Charset = StandardCharsets.UTF_8
var localEcho: Boolean = false
Expand Down
Loading

0 comments on commit ea318e6

Please sign in to comment.