diff --git a/.gitignore b/.gitignore index 79d907f641..a5a48c92e0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ /google-app-engine/build/ /google-app-engine/google-app-engine-yaml/build/ /plan9/build/ - +old .gradle .idea/workspace.xml diff --git a/.idea/ant.xml b/.idea/ant.xml deleted file mode 100644 index c8f67ffc55..0000000000 --- a/.idea/ant.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 3d509fcbba..0000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 5a3d3f7bee..0000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/apache.xml b/.idea/copyright/apache.xml deleted file mode 100644 index bf952cc7bf..0000000000 --- a/.idea/copyright/apache.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/no_copyright.xml b/.idea/copyright/no_copyright.xml deleted file mode 100644 index e94d07c0a9..0000000000 --- a/.idea/copyright/no_copyright.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index 10e22f108c..0000000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/dictionaries/ignatov.xml b/.idea/dictionaries/ignatov.xml deleted file mode 100644 index 98e4622df3..0000000000 --- a/.idea/dictionaries/ignatov.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - exprs - goroutine - mihai - modificator - patan - structs - toader - uintptr - unescapes - unescaping - variadic - vendoring - zolotov - - - \ No newline at end of file diff --git a/.idea/dictionaries/zolotov.xml b/.idea/dictionaries/zolotov.xml deleted file mode 100644 index 904eb5e820..0000000000 --- a/.idea/dictionaries/zolotov.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - autoimport - backticks - consts - covermode - coverprofile - devel - gcloud - gobench - gocheck - goide - goimports - gopath - goroot - gotest - hgap - nacl - netbsd - notwin - openbsd - recv - redeclared - runconfig - solaris - vendored - vgap - vspacer - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index f758959656..0000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml deleted file mode 100644 index 0ac32ed4c6..0000000000 --- a/.idea/externalDependencies.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index a6c0eca433..0000000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml deleted file mode 100644 index 677f828fd9..0000000000 --- a/.idea/inspectionProfiles/idea_default.xml +++ /dev/null @@ -1,893 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 78f1346b90..0000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/All_tests.xml b/.idea/runConfigurations/All_tests.xml deleted file mode 100644 index 8c40b96c17..0000000000 --- a/.idea/runConfigurations/All_tests.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Build_plugin.xml b/.idea/runConfigurations/Build_plugin.xml deleted file mode 100644 index b8277b7e20..0000000000 --- a/.idea/runConfigurations/Build_plugin.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Go.xml b/.idea/runConfigurations/Go.xml deleted file mode 100644 index 8d00e2783c..0000000000 --- a/.idea/runConfigurations/Go.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Local_IDE.xml b/.idea/runConfigurations/Local_IDE.xml deleted file mode 100644 index de09ed9fae..0000000000 --- a/.idea/runConfigurations/Local_IDE.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Performance_tests.xml b/.idea/runConfigurations/Performance_tests.xml deleted file mode 100644 index d49f4d4342..0000000000 --- a/.idea/runConfigurations/Performance_tests.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b843..0000000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/scopes/testdata.xml b/.idea/scopes/testdata.xml deleted file mode 100644 index 409a80ea77..0000000000 --- a/.idea/scopes/testdata.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml index 3b00020308..e96534fb27 100644 --- a/.idea/uiDesigner.xml +++ b/.idea/uiDesigner.xml @@ -121,5 +121,4 @@ - - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 37de0f5d7d..94a25f7f4c 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,15 +1,5 @@ - - - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index a44db78438..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,169 +0,0 @@ -# How to contribute - -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-lang-plugin-org/go-lang-idea-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -## Contents -+ [Reporting errors](#reporting-errors) -+ [Contributing to the code](#contributing-to-the-code) -+ [Submitting test cases](#submitting-test-cases) -+ [Building and running the unit tests](#building-and-running-the-unit-tests) -+ [Configuring and debugging in IntelliJ](#configuring-and-debugging-in-IntelliJ) -+ [Code Style](#code-style) -+ [Delve integration](#delve-integration) -+ [Useful links](#useful-links) - -## Reporting errors - -Before reporting an error, please read the [FAQ](https://github.com/go-lang-plugin-org/go-lang-idea-plugin/wiki/FAQ) -and search for the issue in the issue tracker. Also, please don't bump, +1 -or "me too" issues. Thank you. - -The simplest way to contribute to the plugin is to report issues you encounter -in your day to day use. - -As a rule of thumb, always keep in mind that we are developers just like you. So, -whenever you are going to report an issue, think of how you'd like to receive issues -for your projects. Also, we are doing this in our spare time, so the more information -we have in the report, the faster we can replicate the problem and get on solving it -rather that just doing a bunch of ping-pong in comments trying to extract the needed -details from you. - -This information applies also when you don't have an error that is caught by the -built-in facility but it's something that happens and shouldn't happen (say for -example, a formatting issue). - -When filing an issue, please answer these questions: - -- What version of Go plugin are you using? -- What version of IDEA are you using? -- What version of Java are you using? -- What did you do? -- What did you expect to see? -- What did you see instead? - -Also, every time you can, submit the piece of code that's generating the issue. -As it might be some proprietary code, take some time and write the smallest code -sample that can reproduce it and paste it in the issue (or send it as a link to -[Go Playground](http://play.golang.org/). Screenshots are useful, but, just like -you, we can't copy paste code from screenshots either. - -Please ensure that the bug is not reported already, this helps us focusing on -working on bug fixes not triage work. - -## Contributing to the code - -If you want to contribute to the code, go to GitHub and check out the latest version -and follow the instructions on how to build the plugin from source. After that, you -can start picking some [pending tasks](https://github.com/go-lang-plugin-org/go-lang-idea-plugin/issues) on the issue tracker. - -Make sure you look for issues tags with [up for grabs](https://github.com/go-lang-plugin-org/go-lang-idea-plugin/labels/up%20for%20grabs) -as these are some of the easier ones to get started with. - -### CLA requirement - -Contributing to the plugin requires a signed CLA with JetBrains. -You can view the steps necessary for this at [this page](http://www.jetbrains.org/display/IJOS/Contribute#Contribute-ContributeCode). - -### Submitting test cases - -Submitting test cases is the next best thing you can do to developing on this -project. In fact, you'll actually develop on it since the test code you are -going to contribute is still code. - -Whenever your time or knowledge allows, submitting good test cases for either -for existing issues or for issues that you come across will make a huge difference -in the way we spend time to understand the problems and thus solve them. - -### Building and running the unit tests - -All code can be checked out from our Github repository in the usual way. That is, clone the repository with HTTPS or SSH: - -``` -$ git clone https://github.com/go-lang-plugin-org/go-lang-idea-plugin.git -Cloning into 'go-lang-idea-plugin'... -``` - -On Linux/Mac OS X we use gradle as our build system. Gradle is self-installing. This one command - -``` -$ ./gradlew buildPlugin -``` - -compiles everything, runs the tests, and builds the plugins. The output appears in `build/distributions`. - - -### Configuring and debugging in IntelliJ - -1. [Download](http://www.jetbrains.com/idea/) IDEA Community or Ultimate -1. Setup the right version of [Grammar-Kit](https://github.com/JetBrains/Grammar-Kit/releases/download/1.4.1/GrammarKit.zip) -1. Make sure that **UI Designer** and **Gradle** plugins are turned on -1. Checkout plugin repo and open the project -1. Open the copy of go-lang-idea-plugin repository (`File | New | Project from Existing Sources...`) with it. Then import Gradle project. The default project module config should work with a recent IDEA 15 version -1. Git revert changes to the .idea folder because IDEA Gradle import blows it away (https://youtrack.jetbrains.com/issue/IDEA-146295) -1. Open `File -> Project Settings`, go to the SDKs entry, click the `+` and select JDK 1.6 -1. Go to the Project entry and make sure that the Project SDK is set to selected SDK -1. Wait until the source files of the SDK are indexed -1. Run or debug the **Go** run configuration - -If you use Mac, you may check follow path while looking for SDK: -``` -/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/ -/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/ -``` - -Now you can use the run configurations provided by the plugin source code to -run and play. - -There are multiple branches of the plugin which correspond to different versions -of the IntelliJ Platform: - -- 141 -> can be used for IDEA 14.1 -- 144 -> can be used for IDEA 16 - -The master branch will follow the current stable release of IDEA (currently IDEA 15). - -Going to ``` Run -> Run... ``` will provide you with the following run configurations: - -+ `Go` will spawn a new IDEA with the latest version of the plugin enabled. -+ `All tests` will run all the test cases available in the project. Please make -sure that all the test cases pass before committing anything (or making a pull request). -+ `Performance tests` will run all performance test cases available in the project. -+ `Build plugin` will build plugin distribution archive. All artifacts are stored in `gradle/distributions` directory. - -You can also have a look at some [useful links](#useful-links) for getting started with -plugin development on IntelliJ IDEA platform. - -##### IMPORTANT: MacOS X users note - -You might get the following error ```Unsupported major.minor version 52``` in the -logs or the plugin might not work at all. - -Check the version of Java your IDE is running on. Since in 99.9% of the cases it will -be Java 6, this means that you compiled the plugin with a different version of Java, -for example Java 8. - -To fix the error, please use Java JDK 6 to compile the plugin and everything should work. - -To get the log files, you can go to ```Help | Show Log in File Manager``` and then the -log will be displayed to you. - -### Code Style - -* Please don't use class comments with information about author or date and time creation. -* Please don't commit anything from `.idea/` directory if you're not very sure what you doing. - -### Delve integration - -We're syncing the plugin source with the [Delve](https://github.com/derekparker/delve) debugger. - -If you want to customize delve distribution that's used in the plugin you can use `-Dorg.gradle.project.customDlvPath` for setting up the path to your local version of dlv. - -### Useful links - -For further information please see [the official plugin development page](http://confluence.jetbrains.net/display/IDEADEV/PluginDevelopment). - -Also, you can read some [tips and tricks](http://tomaszdziurko.pl/2011/09/developing-plugin-intellij-idea-some-tips-and-links/). - -For all development questions and proposals, you can mail to our [Open API and Plugin Development forum](https://devnet.jetbrains.com/community/idea/open_api_and_plugin_development). - -Happy hacking! diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md deleted file mode 100644 index 0ea9f364cf..0000000000 --- a/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,20 +0,0 @@ -- Plugin version (or commit hash): -- IDE name and version: -- Java version: -- OS name and version: - -- What are you trying to do? - -- What would you expect to happen? - -- What happens? - - -Your issue description goes here. -Please be as detailed as possible - -```go -Please include a go sample to reproduce the issue -``` - -Or include a screenshot / video of the issue. diff --git a/LICENCE b/LICENCE deleted file mode 100644 index a30b86c59c..0000000000 --- a/LICENCE +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index b700d4856c..0000000000 --- a/README.md +++ /dev/null @@ -1,117 +0,0 @@ -# Go plugin for IntelliJ - -[![Build Status](https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IntellijIdeaPlugins_Go_Test)/statusIcon.svg?guest=1)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=IntellijIdeaPlugins_Go_Test&guest=1) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-lang-plugin-org/go-lang-idea-plugin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -## Pre-release builds - -Please note, that the following features are available in [GoLand, JetBrains's official IDE](https://www.jetbrains.com/go/), or [JetBrains maintained plugin](https://plugins.jetbrains.com/plugin/9568-go), but **not in this plugin**: - -- Navigation - - Go to inheritor structures - - Go to super interfaces -- Type-aware completion (aka Smart completion) -- Extract function refactoring -- Implement type -- Inspections and quick-fixes - - Introduce method - - Introduce field - - Delete unused parameter - - Show symbol duplicates - - Add/delete missing/redundant expressions in case of assignment count mismatch - - Properly implemented Duplicated symbols inspection - - Recursive type detection - - Invalid const initialization -- Tests and coverage - - Sub-tests support (runner, navigation, gutter actions) - - Debugging tests -- Debugger - - Step out - - 100x faster performance -- General - - Highlighting of go:generate comments - - Quick documentation for struct fields - - Semantic highlighting - - Parameter name hints - - SQL auto-injection - - Support for Go 1.9+ - - Support for AppEngine 1.9.54+ - - -**Supported IDEs** - -The plugin can be installed on following IntelliJ-based: - -- IntelliJ 2016.1+ (Ultimate or Community) -- WebStorm 2016.1+ -- PhpStorm 2016.1+ -- PyCharm 2016.1+ -- RubyMine 2016.1+ -- CLion 2016.1+ -- Android Studio 1.2.1+ - -Pre-release builds are available in two forms: nightly and alphas. Alpha builds are usually released at the beginning of every week while nightly builds are released every night. - -To use them do the following: - -1. Use [the instructions](https://www.jetbrains.com/idea/help/managing-enterprise-plugin-repositories.html) -1. Paste the URL for the version you need: - - alpha: https://plugins.jetbrains.com/plugins/alpha/5047 - - nightly: https://plugins.jetbrains.com/plugins/nightly/5047 - -**NOTE** -The above links are not meant to be used in browsers, so don't report issues -about them not working or being inaccessible unless there's an error in the IDE itself. - -Since these are not stable releases, some things might not work as expected. - -### Release versions schema - -Bellow you can see the versions of the plugin which correspond to the versions of the -IntelliJ Platfom (IntelliJ IDEA, WebStorm, PyCharm etc.): - -| Plugin version number | Platform number | -| ---- | --- | -| 0.12.x | IntelliJ 2016.2 (IntelliJ IDEA 2016.2) | -| 0.11.x | IntelliJ 2016.1 (IntelliJ IDEA 2016.1) | -| 0.10.x | IntelliJ 143.1180 - 143.9999 (IntelliJ IDEA 15.0.2+) | -| 0.9.x | IntelliJ 141.1532 - 141.9999 (IntelliJ IDEA 14.1) | - - If you are not using IntelliJ IDEA, then please check the build number of your IDE - as that will correspond to the IntelliJ Platform version. - -Reporting issues is very important for us as such, please see the section below -on how to submit a proper bug report. - -## FAQ - -Here's a list of the most frequently asked questions: [FAQ](https://github.com/go-lang-plugin-org/go-lang-idea-plugin/wiki/FAQ) - -## Bugs - -If you've found a bug, which is not a duplicate, [report it](http://github.com/go-lang-plugin-org/go-lang-idea-plugin/issues). - -When reporting a bug, please include the following: -- IDEA version -- OS version -- JDK version -- Plugin version (or commit hash, if you built the plugin yourself) -- Detailed steps to reproduce (please include sample code) - -## Bumping or +1 comments - -Please don't comment with "bump", "+1", "same for me" or other irrelevant comments as they're useless for identifying the issue and finding the solution. - -Contributions are always welcome and we'll do our best to make the most of them. - -## Contributing - -We encourage you to contribute to the plugin if you find any issues or missing -functionality that you'd like to see. In order to get started, see the -[contribution](CONTRIBUTING.md) guide. - -## [People who helped](https://github.com/go-lang-plugin-org/go-lang-idea-plugin/graphs/contributors) - -## License - -The Gopher icons are based on the Go mascot designed by [Renée French](http://reneefrench.blogspot.com/) and copyrighted under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/). - -The plugin is distributed under Apache License, version 2.0. For full license terms, see [LICENCE](https://github.com/go-lang-plugin-org/go-lang-idea-plugin/blob/master/LICENCE). diff --git a/build.gradle b/build.gradle index 1d2562ecb0..24fa078dcd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,154 +1,72 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -buildscript { - repositories { - maven { url 'http://dl.bintray.com/jetbrains/intellij-plugin-service' } - maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } - } - dependencies { - classpath "org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.2.0-SNAPSHOT" - } -} - plugins { - id "de.undercouch.download" version "3.1.0" + id 'java' + id 'org.jetbrains.intellij' version '0.4.9' + id "de.undercouch.download" version "3.4.3" } apply plugin: 'de.undercouch.download' -version = "${version}.$buildNumber" -allprojects { - apply plugin: 'java' - sourceCompatibility = javaVersion - targetCompatibility = javaTargetVersion - tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } +group 'nz' +version "${version}.$buildNumber" - sourceSets { - main { - java.srcDirs 'src', 'gen' - resources.srcDirs 'resources', 'pluginResources' - } - test { - java.srcDir 'tests' - } - } +sourceCompatibility = 1.8 - apply plugin: 'org.jetbrains.intellij' - intellij { - version ideaVersion - pluginName 'Go' - plugins 'coverage' - downloadSources Boolean.valueOf(sources) - sameSinceUntilBuild Boolean.valueOf(isEAP) - alternativeIdePath localIdePath - systemProperty 'dlv.path', customDlvPath - } +repositories { + mavenCentral() } -publishPlugin { - username publishUsername - password publishPassword - channels publishChannel +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' } +// See https://github.com/JetBrains/gradle-intellij-plugin/ +intellij { + version '2019.1.3' +} patchPluginXml { - if (customSinceBuild) { - sinceBuild customSinceBuild - } + changeNotes """ + Add change notes here.
+ most HTML tags may be used""" } -apply plugin: 'idea' -idea { - project { - jdkName = javaVersion - languageLevel = javaVersion - vcs = 'Git' - } - module { - generatedSourceDirs += file('gen') - } +allprojects { + apply plugin: 'java' + + sourceSets { + main { + java.srcDirs 'src/main/java', 'src/main/gen' + resources.srcDirs 'src/main/resources' + } + test { + java.srcDir 'src/test/java' + } + } + + apply plugin: 'org.jetbrains.intellij' + intellij { + version ideaVersion + pluginName 'Go' + plugins 'coverage' + downloadSources Boolean.valueOf(sources) + sameSinceUntilBuild Boolean.valueOf(isEAP) + alternativeIdePath localIdePath + } + } repositories { maven { url "http://dl.bintray.com/jetbrains/golang" } } dependencies { - compile project(':utils'), project(':google-app-engine'), project(':google-app-engine:google-app-engine-yaml'), project(':plan9') - runtime "com.jetbrains:delve:$delveVersion@zip" -} - -// delve packing -project.afterEvaluate { - prepareSandbox.doLast { - def libraries = "$it.destinationDir/$intellij.pluginName/lib/" - def delveFile = fileTree(dir: libraries, include: 'delve*').singleFile - copy { - from zipTree(delveFile) - into libraries - } - delveFile.delete() - } + compile project(':google-app-engine'), project(':google-app-engine:google-app-engine-yaml') } test { - useJUnit { - excludeCategories 'com.goide.categories.Performance' - } - testLogging { - exceptionFormat = 'full' - } -} - -task preparePerformanceTestData << { - downloadAndUnzip('https://storage.googleapis.com/golang/go1.5.1.src.tar.gz', 'go', 'go') - downloadAndUnzip('https://github.com/docker/docker/archive/v1.9.1.tar.gz', 'docker-1.9.1', 'docker') -} - -task performanceTest(type: Test, group: 'Verification', dependsOn: [classes, testClasses, preparePerformanceTestData]) { - maxHeapSize = '512m' - minHeapSize = '256m' - - useJUnit { - includeCategories 'com.goide.categories.Performance' - reports.html.destination = "$buildDir/reports/performanceTests" - } - testLogging { - exceptionFormat = 'full' - } -} -check.dependsOn performanceTest -private void downloadAndUnzip(url, sourceDir, targetDir) { - def testDataPath = "$projectDir/testData/performance/" - def markerFile = file("$testDataPath/$targetDir/markerFile") - def tmpPath = "$testDataPath/tmp/" - def tar = file("$tmpPath/${targetDir}.tar.gz") - if (!markerFile.exists()) { - download { - src url - dest tar - } - copy { - from tarTree(tar) - into tmpPath + useJUnit { + include 'com/notzippy/intellij/go/intellij/**' + //include '**intellij/actions/*' + excludeCategories 'com.notzippy.intellij.go.intellij.categories.Performance' } - copy { - from "$tmpPath/$sourceDir" - into "$testDataPath/$targetDir" + testLogging { + exceptionFormat = 'full' } - markerFile.createNewFile() - } - delete file(tmpPath) -} \ No newline at end of file +} diff --git a/cloneToWt.sh b/cloneToWt.sh deleted file mode 100755 index fa6c6ea40c..0000000000 --- a/cloneToWt.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# Creates new worktrees for all IntelliJ IDEA repositories pointing to a new release branch. -# Usage: ./cloneToWt.sh -# Restrictions: -# None of the given Git repositories should have the branch with name . -# There should be a remote branch origin/ from which a new local branch will be created by this script. -# You must use Git 2.5.0 or later. - -set -e # Any command which returns non-zero exit code will cause this shell script to exit immediately - -if [[ -z "$1" || -z "$2" ]] ; then - echo " - Usage: ./cloneToWt.sh - Example: ./cloneToWt.sh ~/intellij-go-143 143" - exit 1 -fi - -NEW_REPO="$1" -BRANCH="$2" - -if [[ "$BRANCH" == origin/* ]]; then - BRANCH="${BRANCH/origin\//}" -fi - -# Absolute path to directory containing existing IntelliJ IDEA repo (and this script as well) -OLD_REPO="$(cd "`dirname "$0"`"; pwd)" -ROOTS=("/") - -if [ -d "$NEW_REPO" ]; then - echo "Directory '$NEW_REPO' already exists" - exit 2 -fi - -for ROOT in ${ROOTS[@]}; do - if [[ ! -z `git --git-dir="${OLD_REPO}${ROOT}/.git" --work-tree="${OLD_REPO}${ROOT}" branch --list $BRANCH` ]]; then - echo "Branch '$BRANCH' already exists in $ROOT" - exit 3 - fi -done - -for ROOT in ${ROOTS[@]}; do - git --git-dir="${OLD_REPO}${ROOT}/.git" --work-tree="${OLD_REPO}${ROOT}" worktree add -b $BRANCH "${NEW_REPO}${ROOT}" origin/${BRANCH} -done - -cp -a "$OLD_REPO/.idea/workspace.xml" "$NEW_REPO/.idea/" diff --git a/google-app-engine/google-app-engine-yaml/build.gradle b/google-app-engine/google-app-engine-yaml/build.gradle deleted file mode 100644 index 778156c411..0000000000 --- a/google-app-engine/google-app-engine-yaml/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - compile project(':google-app-engine') -} \ No newline at end of file diff --git a/google-app-engine/google-app-engine-yaml/src/yaml/AppEngineYamlCompletionContributor.java b/google-app-engine/google-app-engine-yaml/src/yaml/AppEngineYamlCompletionContributor.java deleted file mode 100644 index 1255f7fceb..0000000000 --- a/google-app-engine/google-app-engine-yaml/src/yaml/AppEngineYamlCompletionContributor.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package yaml; - -import com.intellij.appengine.AppEngineExtension; -import com.intellij.codeInsight.completion.CompletionContributor; -import com.intellij.codeInsight.completion.CompletionParameters; -import com.intellij.codeInsight.completion.CompletionProvider; -import com.intellij.codeInsight.completion.CompletionResultSet; -import com.intellij.psi.PsiElement; -import com.intellij.util.ProcessingContext; -import org.jetbrains.annotations.NotNull; - -@SuppressWarnings("ALL") -public class AppEngineYamlCompletionContributor extends CompletionContributor { - public AppEngineYamlCompletionContributor() { - //extend(CompletionType.BASIC, key(), new YamlCompletionProvider()); - //extend(CompletionType.BASIC, inSequence(), new YamlCompletionProvider()); - } - - private static class YamlCompletionProvider extends CompletionProvider { - @Override - protected void addCompletions(@NotNull CompletionParameters completionParameters, - ProcessingContext processingContext, - @NotNull CompletionResultSet result) { - PsiElement position = completionParameters.getPosition(); - if (!AppEngineExtension.isAppEngineContext(position)) { - return; - } - } - } -} diff --git a/google-app-engine/google-app-engine-yaml/src/yaml/YamlConstants.java b/google-app-engine/google-app-engine-yaml/src/yaml/YamlConstants.java deleted file mode 100644 index 8c00225a48..0000000000 --- a/google-app-engine/google-app-engine-yaml/src/yaml/YamlConstants.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package yaml; - -import java.util.Collections; -import java.util.EnumSet; - -public interface YamlConstants { - enum Value { - REQUIRED, ADMIN, - UNAUTHORIZED, REDIRECT, - OPTIONAL, NEVER, ALWAYS, - TRUE, FALSE - } - - enum Key { - APPLICATION(true, true), - HANDLERS(true, true), - VERSION(false, true), - RUNTIME(true, true), - API_VERSION(true, true), - URL(true, false), - THREADSAFE(false, true, Value.TRUE, Value.FALSE), - DEFAULT_EXPIRATION(false, true), - BUILTINS(false, true), - INCLUDES(false, true), - INBOUND_SERVICES(false, true), - ADMIN_CONSOLE(false, true), - ERROR_HANDLERS(false, true), - MIME_TYPE(false, false), - EXPIRATION(false, false), - UPLOAD(false, false), - AUTH_FAIL_ACTION(false, false, Value.UNAUTHORIZED, Value.REDIRECT), - SECURE(false, false, Value.OPTIONAL, Value.NEVER, Value.ALWAYS), - LOGIN(false, false, Value.REQUIRED, Value.ADMIN), - SKIP_FILES(false, true), - - TYPE_SCRIPT(true, false), - TYPE_STATIC_DIR(true, false), - TYPE_STATIC_FILES(true, false); - - private final boolean myRequired; - private final boolean myTopLevel; - private final EnumSet myValues; - - Key(boolean required, boolean topLevel, Value... values) { - myRequired = required; - myTopLevel = topLevel; - myValues = EnumSet.noneOf(Value.class); - Collections.addAll(myValues, values); - } - } -} diff --git a/google-app-engine/resources/icons/appEngine.png b/google-app-engine/resources/icons/appEngine.png deleted file mode 100644 index 976ed56d38..0000000000 Binary files a/google-app-engine/resources/icons/appEngine.png and /dev/null differ diff --git a/google-app-engine/resources/icons/appEngine@2x.png b/google-app-engine/resources/icons/appEngine@2x.png deleted file mode 100644 index 773c4d25fc..0000000000 Binary files a/google-app-engine/resources/icons/appEngine@2x.png and /dev/null differ diff --git a/google-app-engine/resources/icons/appEngineMark.png b/google-app-engine/resources/icons/appEngineMark.png deleted file mode 100644 index fa0e6f3906..0000000000 Binary files a/google-app-engine/resources/icons/appEngineMark.png and /dev/null differ diff --git a/google-app-engine/resources/icons/appEngineMark@2x.png b/google-app-engine/resources/icons/appEngineMark@2x.png deleted file mode 100644 index 6c56246d49..0000000000 Binary files a/google-app-engine/resources/icons/appEngineMark@2x.png and /dev/null differ diff --git a/google-app-engine/src/com/intellij/appengine/AppEngineExtension.java b/google-app-engine/src/com/intellij/appengine/AppEngineExtension.java deleted file mode 100644 index 5adee4fcdf..0000000000 --- a/google-app-engine/src/com/intellij/appengine/AppEngineExtension.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.intellij.appengine; - -import com.intellij.openapi.Disposable; -import com.intellij.openapi.extensions.ExtensionPointName; -import com.intellij.openapi.util.Disposer; -import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public abstract class AppEngineExtension { - private static final ExtensionPointName EXTENSION = ExtensionPointName.create("ro.redeul.google.go.appengine.Extension"); - - private static boolean ourTestingMode; - - public static void enableTestingMode(@NotNull Disposable disposable) { - ourTestingMode = true; - Disposer.register(disposable, () -> { - //noinspection AssignmentToStaticFieldFromInstanceMethod - ourTestingMode = false; - }); - } - - public abstract boolean isAppEngineEnabled(@Nullable PsiElement context); - - public static boolean isAppEngineContext(@Nullable PsiElement context) { - for (AppEngineExtension extension : EXTENSION.getExtensions()) { - if (extension.isAppEngineEnabled(context)) { - return true; - } - } - return ourTestingMode; - } -} \ No newline at end of file diff --git a/google-app-engine/src/com/intellij/appengine/GoogleAppEngineIcons.java b/google-app-engine/src/com/intellij/appengine/GoogleAppEngineIcons.java deleted file mode 100644 index 6b2b50fa58..0000000000 --- a/google-app-engine/src/com/intellij/appengine/GoogleAppEngineIcons.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.intellij.appengine; - -import com.intellij.openapi.util.IconLoader; - -import javax.swing.*; - -public class GoogleAppEngineIcons { - public static final Icon AppEngine = IconLoader.findIcon("/icons/appEngine.png"); - public static final Icon AppEngineMark = IconLoader.findIcon("/icons/appEngineMark.png"); - - private GoogleAppEngineIcons() {} -} diff --git a/gradle.properties b/gradle.properties index 990595908a..2feb52cdb1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ # version = 0.13 -ideaVersion = 2017.3 +ideaVersion = 2019.1 javaVersion = 1.8 javaTargetVersion = 1.8 delveVersion = 0.11.318 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1d7437d238..94336fcae9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cce9b92446..2f080525f6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,22 +1,6 @@ -# -# Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#Wed Jun 22 07:25:55 MSK 2016 +#Mon Jul 08 15:33:27 PDT 2019 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-milestone-2-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 9aa616c273..cccdd3d517 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -154,16 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then cd "$(dirname "$0")" fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/plan9/build.gradle b/plan9/build.gradle deleted file mode 100644 index eeaccad065..0000000000 --- a/plan9/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -//version '0.10.SNAPSHOT' -// -//apply plugin: 'java' -// -//sourceCompatibility = 1.5 -// -//repositories { -// mavenCentral() -//} -// -//dependencies { -// testCompile group: 'junit', name: 'junit', version: '4.11' -//} diff --git a/plan9/gen/com/plan9/intel/lang/core/lexer/_AsmIntelHighlightingLexer.java b/plan9/gen/com/plan9/intel/lang/core/lexer/_AsmIntelHighlightingLexer.java deleted file mode 100644 index 47f95ad5d9..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/lexer/_AsmIntelHighlightingLexer.java +++ /dev/null @@ -1,1465 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* The following code was generated by JFlex 1.4.3 on 3/26/16 7:41 PM */ - -package com.plan9.intel.lang.core.lexer; - -import com.intellij.lexer.FlexLexer; -import com.intellij.psi.TokenType; -import com.intellij.psi.tree.IElementType; -import com.intellij.util.text.CharArrayUtil; - -import java.io.IOException; -import java.io.Reader; - -import static com.plan9.intel.ide.highlighting.AsmIntelLexerTokens.*; - - -/** - * This class is a scanner generated by - * JFlex 1.4.3 - * on 3/26/16 7:41 PM from the specification file - * /Users/zolotov/dev/intellij-plugins/intellij-go/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelHighlightingLexer.flex - */ -public class _AsmIntelHighlightingLexer implements FlexLexer { - /** initial size of the lookahead buffer */ - private static final int ZZ_BUFFERSIZE = 16384; - - /** lexical states */ - public static final int YYINITIAL = 0; - - /** - * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l - * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l - * at the beginning of a line - * l is of the form l = 2*k, k a non negative integer - */ - private static final int ZZ_LEXSTATE[] = { - 0, 0 - }; - - /** - * Translates characters to character classes - */ - private static final String ZZ_CMAP_PACKED = - "\11\0\1\3\1\1\1\0\1\2\1\1\22\0\1\3\1\0\1\5"+ - "\1\60\1\0\2\12\1\0\1\72\1\72\2\12\1\73\1\12\1\0"+ - "\1\4\1\13\1\41\1\42\1\43\1\44\1\45\1\47\1\11\1\37"+ - "\1\40\1\16\1\0\1\74\1\0\1\75\2\0\1\26\1\24\1\30"+ - "\1\25\1\20\1\31\1\21\1\46\1\35\1\53\1\52\1\22\1\50"+ - "\1\33\1\23\1\27\1\54\1\36\1\34\1\17\1\32\1\56\1\51"+ - "\1\15\1\55\1\57\3\0\1\12\1\6\1\0\2\10\1\63\1\66"+ - "\1\67\1\70\2\6\1\61\2\6\1\64\1\6\1\62\4\6\1\71"+ - "\1\6\1\65\2\6\1\14\2\6\1\0\1\12\1\0\1\12\53\0"+ - "\1\6\12\0\1\6\1\0\1\6\2\0\1\6\5\0\27\6\1\0"+ - "\37\6\1\0\u01ca\6\4\0\14\6\16\0\5\6\7\0\1\6\1\0"+ - "\1\6\201\0\5\6\1\0\2\6\2\0\4\6\10\0\1\6\1\0"+ - "\3\6\1\0\1\6\1\0\24\6\1\0\123\6\1\0\213\6\10\0"+ - "\236\6\11\0\46\6\2\0\1\6\7\0\47\6\110\0\33\6\5\0"+ - "\3\6\55\0\53\6\25\0\12\7\4\0\2\6\1\0\143\6\1\0"+ - "\1\6\17\0\2\6\7\0\2\6\12\7\3\6\2\0\1\6\20\0"+ - "\1\6\1\0\36\6\35\0\131\6\13\0\1\6\16\0\12\7\41\6"+ - "\11\0\2\6\4\0\1\6\5\0\26\6\4\0\1\6\11\0\1\6"+ - "\3\0\1\6\27\0\31\6\107\0\1\6\1\0\13\6\127\0\66\6"+ - "\3\0\1\6\22\0\1\6\7\0\12\6\4\0\12\7\1\0\7\6"+ - "\1\0\7\6\5\0\10\6\2\0\2\6\2\0\26\6\1\0\7\6"+ - "\1\0\1\6\3\0\4\6\3\0\1\6\20\0\1\6\15\0\2\6"+ - "\1\0\3\6\4\0\12\7\2\6\23\0\6\6\4\0\2\6\2\0"+ - "\26\6\1\0\7\6\1\0\2\6\1\0\2\6\1\0\2\6\37\0"+ - "\4\6\1\0\1\6\7\0\12\7\2\0\3\6\20\0\11\6\1\0"+ - "\3\6\1\0\26\6\1\0\7\6\1\0\2\6\1\0\5\6\3\0"+ - "\1\6\22\0\1\6\17\0\2\6\4\0\12\7\25\0\10\6\2\0"+ - "\2\6\2\0\26\6\1\0\7\6\1\0\2\6\1\0\5\6\3\0"+ - "\1\6\36\0\2\6\1\0\3\6\4\0\12\7\1\0\1\6\21\0"+ - "\1\6\1\0\6\6\3\0\3\6\1\0\4\6\3\0\2\6\1\0"+ - "\1\6\1\0\2\6\3\0\2\6\3\0\3\6\3\0\14\6\26\0"+ - "\1\6\25\0\12\7\25\0\10\6\1\0\3\6\1\0\27\6\1\0"+ - "\12\6\1\0\5\6\3\0\1\6\32\0\2\6\6\0\2\6\4\0"+ - "\12\7\25\0\10\6\1\0\3\6\1\0\27\6\1\0\12\6\1\0"+ - "\5\6\3\0\1\6\40\0\1\6\1\0\2\6\4\0\12\7\1\0"+ - "\2\6\22\0\10\6\1\0\3\6\1\0\51\6\2\0\1\6\20\0"+ - "\1\6\21\0\2\6\4\0\12\7\12\0\6\6\5\0\22\6\3\0"+ - "\30\6\1\0\11\6\1\0\1\6\2\0\7\6\72\0\60\6\1\0"+ - "\2\6\14\0\7\6\11\0\12\7\47\0\2\6\1\0\1\6\2\0"+ - "\2\6\1\0\1\6\2\0\1\6\6\0\4\6\1\0\7\6\1\0"+ - "\3\6\1\0\1\6\1\0\1\6\2\0\2\6\1\0\4\6\1\0"+ - "\2\6\11\0\1\6\2\0\5\6\1\0\1\6\11\0\12\7\2\0"+ - "\4\6\40\0\1\6\37\0\12\7\26\0\10\6\1\0\44\6\33\0"+ - "\5\6\163\0\53\6\24\0\1\6\12\7\6\0\6\6\4\0\4\6"+ - "\3\0\1\6\3\0\2\6\7\0\3\6\4\0\15\6\14\0\1\6"+ - "\1\0\12\7\6\0\46\6\1\0\1\6\5\0\1\6\2\0\53\6"+ - "\1\0\u014d\6\1\0\4\6\2\0\7\6\1\0\1\6\1\0\4\6"+ - "\2\0\51\6\1\0\4\6\2\0\41\6\1\0\4\6\2\0\7\6"+ - "\1\0\1\6\1\0\4\6\2\0\17\6\1\0\71\6\1\0\4\6"+ - "\2\0\103\6\45\0\20\6\20\0\125\6\14\0\u026c\6\2\0\21\6"+ - "\1\0\32\6\5\0\113\6\25\0\15\6\1\0\4\6\16\0\22\6"+ - "\16\0\22\6\16\0\15\6\1\0\3\6\17\0\64\6\43\0\1\6"+ - "\4\0\1\6\3\0\12\7\46\0\12\7\6\0\130\6\10\0\51\6"+ - "\1\0\1\6\5\0\106\6\12\0\35\6\51\0\12\7\36\6\2\0"+ - "\5\6\13\0\54\6\25\0\7\6\10\0\12\7\46\0\27\6\11\0"+ - "\65\6\53\0\12\7\6\0\12\7\15\0\1\6\135\0\57\6\21\0"+ - "\7\6\4\0\12\7\51\0\36\6\15\0\2\6\12\7\54\6\32\0"+ - "\44\6\34\0\12\7\3\0\3\6\12\7\44\6\153\0\4\6\1\0"+ - "\4\6\3\0\2\6\11\0\300\6\100\0\u0116\6\2\0\6\6\2\0"+ - "\46\6\2\0\6\6\2\0\10\6\1\0\1\6\1\0\1\6\1\0"+ - "\1\6\1\0\37\6\2\0\65\6\1\0\7\6\1\0\1\6\3\0"+ - "\3\6\1\0\7\6\3\0\4\6\2\0\6\6\4\0\15\6\5\0"+ - "\3\6\1\0\7\6\164\0\1\6\15\0\1\6\20\0\15\6\145\0"+ - "\1\6\4\0\1\6\2\0\12\6\1\0\1\6\3\0\5\6\6\0"+ - "\1\6\1\0\1\6\1\0\1\6\1\0\4\6\1\0\13\6\2\0"+ - "\4\6\5\0\5\6\4\0\1\6\64\0\2\6\220\0\1\6\u09ea\0"+ - "\57\6\1\0\57\6\1\0\205\6\6\0\4\6\3\0\2\6\14\0"+ - "\46\6\1\0\1\6\5\0\1\6\2\0\70\6\7\0\1\6\20\0"+ - "\27\6\11\0\7\6\1\0\7\6\1\0\7\6\1\0\7\6\1\0"+ - "\7\6\1\0\7\6\1\0\7\6\1\0\7\6\120\0\1\6\u01d5\0"+ - "\2\6\52\0\5\6\5\0\2\6\4\0\126\6\6\0\3\6\1\0"+ - "\132\6\1\0\4\6\5\0\51\6\3\0\136\6\21\0\33\6\65\0"+ - "\20\6\u0200\0\u19b6\6\112\0\u51cd\6\63\0\u048d\6\103\0\56\6\2\0"+ - "\u010d\6\3\0\20\6\12\7\2\6\24\0\57\6\20\0\31\6\10\0"+ - "\106\6\61\0\11\6\2\0\147\6\2\0\4\6\1\0\4\6\14\0"+ - "\13\6\115\0\12\6\1\0\3\6\1\0\4\6\1\0\27\6\35\0"+ - "\64\6\16\0\62\6\34\0\12\7\30\0\6\6\3\0\1\6\4\0"+ - "\12\7\34\6\12\0\27\6\31\0\35\6\7\0\57\6\34\0\1\6"+ - "\12\7\46\0\51\6\27\0\3\6\1\0\10\6\4\0\12\7\6\0"+ - "\27\6\3\0\1\6\5\0\60\6\1\0\1\6\3\0\2\6\2\0"+ - "\5\6\2\0\1\6\1\0\1\6\30\0\3\6\2\0\13\6\7\0"+ - "\3\6\14\0\6\6\2\0\6\6\2\0\6\6\11\0\7\6\1\0"+ - "\7\6\221\0\43\6\15\0\12\7\6\0\u2ba4\6\14\0\27\6\4\0"+ - "\61\6\u2104\0\u016e\6\2\0\152\6\46\0\7\6\14\0\5\6\5\0"+ - "\1\6\1\0\12\6\1\0\15\6\1\0\5\6\1\0\1\6\1\0"+ - "\2\6\1\0\2\6\1\0\154\6\41\0\u016b\6\22\0\100\6\2\0"+ - "\66\6\50\0\14\6\164\0\5\6\1\0\207\6\23\0\12\7\7\0"+ - "\32\6\6\0\32\6\13\0\131\6\3\0\6\6\2\0\6\6\2\0"+ - "\6\6\2\0\3\6\43\0"; - - /** - * Translates characters to character classes - */ - private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); - - /** - * Translates DFA states to action switch labels. - */ - private static final int [] ZZ_ACTION = zzUnpackAction(); - - private static final String ZZ_ACTION_PACKED_0 = - "\1\0\1\1\2\2\1\3\1\1\1\4\1\5\1\3"+ - "\1\5\27\4\1\1\1\6\1\7\2\1\1\10\1\0"+ - "\1\11\1\12\1\0\1\13\10\4\1\13\22\4\1\13"+ - "\5\4\1\13\11\4\1\14\6\4\1\13\16\4\1\14"+ - "\4\4\1\13\2\4\1\13\10\4\1\14\1\4\1\14"+ - "\32\4\7\15\1\4\1\15\6\4\4\0\1\16\10\4"+ - "\1\13\2\4\1\17\145\4\1\17\10\4\1\15\4\4"+ - "\1\17\1\15\22\4\5\0\3\4\1\20\3\4\1\15"+ - "\14\4\1\15\57\4\1\15\26\4\4\15\3\4\2\15"+ - "\6\4\5\0\4\4\1\21\11\4\2\15\32\4\3\15"+ - "\1\4\1\15\2\4\1\15\23\4\3\0\1\22\1\4"+ - "\1\15\7\4\1\15\11\4\1\15\11\4\1\0\35\4"; - - private static int [] zzUnpackAction() { - int [] result = new int[570]; - int offset = 0; - offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackAction(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; - } - - - /** - * Translates a state to a row index in the transition table - */ - private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); - - private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\76\0\174\0\76\0\272\0\370\0\u0136\0\u0174"+ - "\0\76\0\u01b2\0\u01f0\0\u022e\0\u026c\0\u02aa\0\u02e8\0\u0326"+ - "\0\u0364\0\u03a2\0\u03e0\0\u041e\0\u045c\0\u049a\0\u04d8\0\u0516"+ - "\0\u0554\0\u0592\0\u05d0\0\u060e\0\u064c\0\u068a\0\u06c8\0\u0706"+ - "\0\u0744\0\u0782\0\76\0\76\0\u07c0\0\u07fe\0\u083c\0\370"+ - "\0\76\0\76\0\u087a\0\u0136\0\u08b8\0\u08f6\0\u0934\0\u0972"+ - "\0\u09b0\0\u09ee\0\u0a2c\0\u0a6a\0\u0aa8\0\u0ae6\0\u0b24\0\u0b62"+ - "\0\u0ba0\0\u0bde\0\u0c1c\0\u0c5a\0\u0c98\0\u0cd6\0\u0d14\0\u0d52"+ - "\0\u0d90\0\u0dce\0\u0e0c\0\u0e4a\0\u0e88\0\u0ec6\0\u0f04\0\u0f42"+ - "\0\u0f80\0\u0fbe\0\u0ffc\0\u103a\0\u1078\0\u10b6\0\u10f4\0\u1132"+ - "\0\u1170\0\u11ae\0\u11ec\0\u122a\0\u1268\0\u12a6\0\u12e4\0\u1322"+ - "\0\u1360\0\u139e\0\u13dc\0\u141a\0\u1458\0\u1496\0\u14d4\0\u1512"+ - "\0\u1550\0\u158e\0\u15cc\0\u160a\0\u1648\0\u1686\0\u16c4\0\u1702"+ - "\0\u1740\0\u177e\0\u17bc\0\u17fa\0\u1838\0\u1876\0\u18b4\0\u18f2"+ - "\0\u1930\0\u196e\0\u19ac\0\u19ea\0\u1a28\0\u1a66\0\u1aa4\0\u1ae2"+ - "\0\u1b20\0\u1b5e\0\u1b9c\0\u1bda\0\u1c18\0\u1c56\0\u1c94\0\u1cd2"+ - "\0\u0f42\0\u1d10\0\u1d4e\0\u1d8c\0\u1dca\0\u1e08\0\u1e46\0\u1e84"+ - "\0\u1ec2\0\u1f00\0\u1f3e\0\u1f7c\0\u1fba\0\u1ff8\0\u2036\0\u2074"+ - "\0\u20b2\0\u20f0\0\u212e\0\u216c\0\u21aa\0\u21e8\0\u2226\0\u2264"+ - "\0\u22a2\0\u22e0\0\u231e\0\u1550\0\u235c\0\u239a\0\u23d8\0\u2416"+ - "\0\u2454\0\u2492\0\u24d0\0\u0136\0\u250e\0\u254c\0\u258a\0\u25c8"+ - "\0\u2606\0\u2644\0\u2682\0\u26c0\0\u26fe\0\u273c\0\u087a\0\u277a"+ - "\0\u27b8\0\u27f6\0\u2834\0\u2872\0\u28b0\0\u28ee\0\u292c\0\u296a"+ - "\0\u29a8\0\u29e6\0\u0136\0\u2a24\0\u2a62\0\u2aa0\0\u2ade\0\u2b1c"+ - "\0\u2b5a\0\u2b98\0\u2bd6\0\u2c14\0\u2c52\0\u2c90\0\u2cce\0\u2d0c"+ - "\0\u2d4a\0\u2d88\0\u2dc6\0\u2e04\0\u2416\0\u2e42\0\u2e80\0\u2ebe"+ - "\0\u2efc\0\u2f3a\0\u2f78\0\u2fb6\0\u2ff4\0\u3032\0\u3070\0\u30ae"+ - "\0\u30ec\0\u312a\0\u3168\0\u31a6\0\u31e4\0\u3222\0\u3260\0\u329e"+ - "\0\u32dc\0\u331a\0\u3358\0\u3396\0\u33d4\0\u3412\0\u3450\0\u348e"+ - "\0\u34cc\0\u350a\0\u3548\0\u3586\0\u35c4\0\u3602\0\u3640\0\u367e"+ - "\0\u36bc\0\u36fa\0\u3738\0\u3776\0\u37b4\0\u37f2\0\u3830\0\u386e"+ - "\0\u38ac\0\u38ea\0\u3928\0\u3966\0\u39a4\0\u39e2\0\u3a20\0\u3a5e"+ - "\0\u3a9c\0\u3ada\0\u3b18\0\u3b56\0\u3b94\0\u3bd2\0\u3c10\0\u3c4e"+ - "\0\u3c8c\0\u3cca\0\u3d08\0\u3d46\0\u3d84\0\u3dc2\0\u3e00\0\u3e3e"+ - "\0\u3e7c\0\u3eba\0\u3ef8\0\u3f36\0\u3f74\0\u3fb2\0\u3ff0\0\u402e"+ - "\0\u406c\0\u40aa\0\u40e8\0\u4126\0\u4164\0\u41a2\0\u41e0\0\u421e"+ - "\0\u425c\0\u429a\0\u42d8\0\u4316\0\u4354\0\u4392\0\u43d0\0\u440e"+ - "\0\u444c\0\u16c4\0\u448a\0\u44c8\0\u4506\0\u4544\0\u4582\0\u45c0"+ - "\0\u45fe\0\u463c\0\u467a\0\u46b8\0\u46f6\0\u4734\0\u4772\0\u47b0"+ - "\0\u47ee\0\u482c\0\u486a\0\u48a8\0\u48e6\0\u4924\0\u4962\0\u49a0"+ - "\0\u49de\0\u4a1c\0\u4a5a\0\u4a98\0\u4ad6\0\u4b14\0\u4b52\0\u4b90"+ - "\0\u4bce\0\u4c0c\0\u0136\0\u4c4a\0\u4c88\0\u4cc6\0\u4d04\0\u4d42"+ - "\0\u4d80\0\u4dbe\0\u4dfc\0\u4e3a\0\u4e78\0\u4eb6\0\u4ef4\0\u4f32"+ - "\0\u4f70\0\u4fae\0\u4fec\0\u502a\0\u5068\0\u50a6\0\u50e4\0\u5122"+ - "\0\u5160\0\u519e\0\u51dc\0\u521a\0\u5258\0\u5296\0\u52d4\0\u5312"+ - "\0\u45c0\0\u5350\0\u538e\0\u53cc\0\u540a\0\u5448\0\u5486\0\u54c4"+ - "\0\u5502\0\u5540\0\u557e\0\u55bc\0\u55fa\0\u5638\0\u5676\0\u56b4"+ - "\0\u56f2\0\u5730\0\u576e\0\u57ac\0\u57ea\0\u5828\0\u5866\0\u58a4"+ - "\0\u58e2\0\u5920\0\u595e\0\u599c\0\u59da\0\u5a18\0\u5a56\0\u5a94"+ - "\0\u5ad2\0\u5b10\0\u5b4e\0\u5b8c\0\u5bca\0\u5c08\0\u5c46\0\u5c84"+ - "\0\u5cc2\0\u5d00\0\u5d3e\0\u5d7c\0\u5dba\0\u5df8\0\u235c\0\u5e36"+ - "\0\u23d8\0\u5e74\0\u5eb2\0\u5ef0\0\u5f2e\0\u5f6c\0\u5faa\0\u5fe8"+ - "\0\u6026\0\u6064\0\u60a2\0\u60e0\0\u611e\0\u615c\0\u619a\0\u61d8"+ - "\0\u6216\0\u6254\0\u6292\0\u62d0\0\u630e\0\u634c\0\u638a\0\u63c8"+ - "\0\u6406\0\u6444\0\u6482\0\u64c0\0\u64fe\0\u653c\0\u657a\0\u65b8"+ - "\0\u65f6\0\u6634\0\u0136\0\u6672\0\u66b0\0\u66ee\0\u672c\0\u676a"+ - "\0\u67a8\0\u67e6\0\u6824\0\u6862\0\u3032\0\u68a0\0\u68de\0\u691c"+ - "\0\u695a\0\u6998\0\u69d6\0\u6a14\0\u6a52\0\u6a90\0\u6ace\0\u6b0c"+ - "\0\u6b4a\0\u6b88\0\u6bc6\0\u6c04\0\u6c42\0\u6c80\0\u6cbe\0\u6cfc"+ - "\0\u6d3a\0\u6d78\0\u6db6\0\u6df4\0\u6e32\0\u6e70\0\u6eae\0\u6eec"+ - "\0\u3e7c\0\u5c08\0\u6f2a\0\u6f68\0\u6fa6\0\u6fe4\0\u7022\0\u7060"+ - "\0\u709e\0\u70dc\0\u711a\0\u7158\0\u7196\0\u71d4\0\u7212\0\u7250"+ - "\0\u728e\0\u72cc\0\u730a\0\u60e0\0\u7348\0\u7386\0\u73c4\0\u7402"+ - "\0\u7440\0\u747e\0\u74bc\0\u74fa\0\u7538\0\u7576\0\76\0\u75b4"+ - "\0\u75f2\0\u7630\0\u766e\0\u76ac\0\u76ea\0\u7728\0\u7766\0\u77a4"+ - "\0\u5920\0\u77e2\0\u7820\0\u785e\0\u789c\0\u78da\0\u7918\0\u7956"+ - "\0\u7994\0\u79d2\0\u7a10\0\u7a4e\0\u7a8c\0\u7aca\0\u7b08\0\u7b46"+ - "\0\u7b84\0\u7bc2\0\u7c00\0\u7c3e\0\u7c7c\0\u7cba\0\u7cf8\0\u7d36"+ - "\0\u7d74\0\u7db2\0\u7df0\0\u7e2e\0\u7e6c\0\u7eaa\0\u7ee8\0\u7f26"+ - "\0\u7f64\0\u7fa2\0\u7fe0\0\u801e\0\u805c\0\u809a\0\u80d8\0\u8116"+ - "\0\u8154\0\u8192\0\u81d0\0\u820e\0\u824c\0\u828a\0\u82c8\0\u8306"+ - "\0\u8344\0\u8382"; - - private static int [] zzUnpackRowMap() { - int [] result = new int[570]; - int offset = 0; - offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackRowMap(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int high = packed.charAt(i++) << 16; - result[j++] = high | packed.charAt(i++); - } - return j; - } - - /** - * The transition table of the DFA - */ - private static final int [] ZZ_TRANS = zzUnpackTrans(); - - private static final String ZZ_TRANS_PACKED_0 = - "\1\2\1\3\1\4\1\3\1\5\1\6\1\7\1\2"+ - "\1\7\1\10\1\11\1\12\1\7\1\13\1\2\1\14"+ - "\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24"+ - "\1\25\1\26\1\27\1\30\1\31\1\32\1\33\7\10"+ - "\1\34\1\10\1\35\1\36\1\7\1\37\1\40\1\7"+ - "\1\41\1\7\1\42\11\7\1\43\1\44\1\45\1\46"+ - "\77\0\1\3\1\0\1\3\76\0\1\47\71\0\5\50"+ - "\1\51\70\50\6\0\4\7\1\0\3\7\1\52\41\7"+ - "\1\0\11\7\15\0\1\10\1\0\1\10\23\0\7\10"+ - "\1\0\1\10\42\0\2\53\66\0\3\7\1\54\1\0"+ - "\1\54\2\7\1\52\1\55\1\56\1\7\1\57\1\60"+ - "\1\61\1\7\1\62\1\7\1\63\5\7\1\64\2\54"+ - "\1\65\4\54\1\7\1\54\10\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\7\1\66\1\7\1\67"+ - "\3\7\1\70\7\7\1\71\21\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\14\7\1\72\1\54\13\7"+ - "\1\73\7\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\3\7\1\74\2\7\1\75\6\7\1\54\23\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\1\7"+ - "\1\76\2\7\1\77\1\7\1\100\1\101\2\7\1\102"+ - "\2\7\1\103\23\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\13\7\1\104\3\7\1\105\21\7\1\0"+ - "\11\7\12\0\4\7\1\0\2\7\1\54\1\52\1\106"+ - "\2\7\1\54\1\107\3\7\1\110\4\7\1\111\11\7"+ - "\1\54\6\7\1\112\2\7\1\0\11\7\12\0\4\7"+ - "\1\0\2\7\1\54\1\52\1\7\1\113\1\7\1\54"+ - "\3\7\1\114\3\7\1\115\1\7\1\54\1\116\1\71"+ - "\7\7\1\54\11\7\1\0\11\7\12\0\4\7\1\0"+ - "\2\7\1\54\1\52\1\7\1\117\1\7\1\54\2\7"+ - "\1\120\1\121\4\7\1\122\2\7\1\123\7\7\1\54"+ - "\11\7\1\0\11\7\12\0\4\7\1\0\2\7\1\124"+ - "\1\52\1\7\1\125\2\7\1\126\2\7\1\127\1\7"+ - "\1\130\1\131\1\132\1\7\1\133\1\134\1\135\11\7"+ - "\1\136\7\7\1\0\11\7\12\0\4\7\1\0\2\7"+ - "\1\54\1\52\3\7\1\137\1\140\1\7\1\141\1\142"+ - "\1\143\4\7\1\54\1\7\1\144\7\7\1\54\1\7"+ - "\1\145\1\146\2\7\1\147\1\7\1\150\1\7\1\0"+ - "\11\7\12\0\3\7\1\54\1\0\1\54\1\7\1\151"+ - "\1\52\1\152\2\7\1\153\2\7\1\154\1\155\1\156"+ - "\1\157\1\160\1\161\1\162\1\163\1\164\1\165\2\7"+ - "\1\54\1\166\3\54\1\7\1\54\1\167\4\7\1\170"+ - "\2\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\11\7\1\171\2\7\1\172\24\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\7\1\173\2\7\1\174"+ - "\34\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\175\1\176\3\7\1\177\1\7\1\200\1\201\1\202"+ - "\1\102\1\203\1\7\1\54\1\110\10\7\1\204\2\7"+ - "\1\205\2\7\1\206\1\207\2\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\6\7\1\210\5\7\1\211"+ - "\2\7\1\212\11\7\1\213\7\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\7\1\214\2\7\1\215"+ - "\1\7\1\216\2\7\1\217\3\7\1\220\2\7\2\110"+ - "\1\221\16\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\3\7\1\222\35\7\1\0\11\7\12\0\3\7"+ - "\1\54\1\0\1\54\2\7\1\52\4\7\1\223\2\7"+ - "\1\224\2\7\1\102\1\225\1\7\1\226\1\227\3\7"+ - "\5\54\1\7\1\54\10\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\4\7\1\230\1\231\1\7\1\232"+ - "\7\7\1\233\21\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\1\7\1\234\1\235\1\236\1\237\1\240"+ - "\1\7\1\240\1\241\1\242\2\7\1\243\1\244\11\7"+ - "\1\245\1\7\1\246\6\7\1\244\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\13\7\1\247\25\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\1\7\1\250"+ - "\6\7\1\251\27\7\1\252\1\0\11\7\65\0\1\253"+ - "\3\0\1\254\1\255\1\256\102\0\1\11\76\0\1\11"+ - "\1\47\1\0\74\47\10\0\2\257\1\0\1\257\4\0"+ - "\1\257\3\0\3\257\1\0\2\257\5\0\7\257\1\0"+ - "\1\257\13\0\1\257\2\0\3\257\13\0\4\7\1\0"+ - "\3\7\1\52\1\7\1\152\37\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\14\7\1\146\24\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\7\7\1\222"+ - "\31\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\17\7\1\105\21\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\1\7\1\260\37\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\5\7\1\261\1\262\2\7"+ - "\1\263\27\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\27\7\1\264\11\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\7\1\265\37\7\1\0\11\7"+ - "\12\0\4\7\1\0\1\54\2\7\1\52\22\7\5\54"+ - "\12\7\1\0\11\7\12\0\4\7\1\0\2\7\1\266"+ - "\1\52\15\7\1\267\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\15\7\1\270\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\15\7\1\271\23\7"+ - "\1\0\11\7\12\0\3\7\1\54\1\0\1\54\2\7"+ - "\1\52\22\7\5\54\1\7\1\54\10\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\272\5\7\1\273"+ - "\32\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\31\7\1\274\7\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\4\7\1\275\34\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\276\40\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\7\7\1\277\31\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\4\7"+ - "\1\300\1\7\1\301\2\7\1\302\2\7\1\303\24\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\1\276"+ - "\30\7\1\304\7\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\15\7\1\222\1\7\1\305\7\7\1\306"+ - "\11\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\7\1\307\37\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\305\35\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\310\40\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\3\7\1\244\1\7"+ - "\1\244\2\7\1\311\21\7\1\244\2\7\1\244\3\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\3\7"+ - "\1\244\5\7\1\312\3\7\1\312\1\7\1\312\12\7"+ - "\1\244\2\7\1\244\3\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\13\7\1\313\25\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\5\7\1\54\33\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\12\7"+ - "\1\312\4\7\1\312\12\7\1\314\6\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\315\40\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\11\7\1\316"+ - "\27\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\317\6\7\1\244\5\7\1\244\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\10\7\1\320\30\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\5\7"+ - "\1\54\31\7\1\321\1\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\15\7\1\322\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\6\7\1\321\2\7"+ - "\1\316\22\7\1\323\4\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\6\7\2\244\5\7\1\244\13\7"+ - "\1\244\7\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\6\7\1\324\32\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\10\7\1\325\30\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\4\7\1\326\34\7"+ - "\1\0\11\7\12\0\4\7\1\0\2\7\1\327\1\52"+ - "\41\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\10\7\1\330\6\7\1\244\21\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\6\7\1\331\2\7\1\332"+ - "\1\7\1\333\1\334\22\7\1\335\1\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\3\7\1\336\2\7"+ - "\1\337\22\7\1\340\7\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\7\7\1\341\1\342\1\343\2\7"+ - "\1\344\1\345\1\7\1\346\3\7\1\347\5\7\1\350"+ - "\7\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\14\7\1\351\1\352\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\3\7\1\353\3\7\1\354\3\7"+ - "\1\355\3\7\1\356\7\7\1\357\2\7\1\360\6\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\14\7"+ - "\1\361\6\7\1\362\15\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\7\1\363\37\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\4\7\1\364\2\7"+ - "\1\365\3\7\1\366\2\7\1\367\22\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\274\5\7\1\244"+ - "\2\7\1\244\4\7\1\244\22\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\31\7\1\370\7\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\35\7\1\244"+ - "\3\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\3\7\1\371\35\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\13\7\1\372\25\7\1\0\11\7\12\0"+ - "\3\7\1\54\1\0\1\54\2\7\1\52\11\7\1\373"+ - "\6\7\2\54\1\65\4\54\1\7\1\54\10\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\4\7\1\374"+ - "\3\7\1\375\1\244\27\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\6\7\1\244\32\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\4\7\1\244\34\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\1\376"+ - "\40\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\377\6\7\1\u0100\1\7\1\u0101\3\7\1\u0102\1\7"+ - "\1\u0103\21\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\15\7\1\222\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\6\7\1\u0104\32\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\7\1\u0105\14\7"+ - "\1\u0106\22\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\5\7\1\274\1\u0107\32\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\u0108\6\7\1\u0109\7\7"+ - "\1\u010a\21\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\3\7\1\u010b\1\u010c\22\7\1\274\1\7\1\u010d"+ - "\7\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\17\7\1\u010e\21\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\11\7\1\u010f\2\7\1\u0110\24\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\4\7\1\u0111"+ - "\34\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\u0112\6\7\1\u0113\1\7\1\u0114\1\7\1\u0115\2\7"+ - "\1\u0116\16\7\1\u0117\3\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\14\7\1\u0118\24\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\14\7\1\u0119\1\u011a"+ - "\23\7\1\0\11\7\12\0\4\7\1\0\2\7\1\u011b"+ - "\1\52\41\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\4\7\1\u011c\6\7\1\u011d\25\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\3\7\1\u011e\35\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\4\7"+ - "\1\140\34\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\10\7\1\u011f\30\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\7\1\u0120\1\316\36\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\1\316\7\7"+ - "\1\u0121\1\7\1\u0122\2\7\1\u0123\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\4\7\1\301\1\7"+ - "\1\244\2\7\1\244\4\7\1\244\12\7\1\304\7\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\1\u0124"+ - "\40\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\5\7\1\316\33\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\316\13\7\1\316\7\7\1\306"+ - "\11\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\7\7\1\301\31\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\5\7\1\321\33\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\316\7\7\1\u0125"+ - "\3\7\1\316\21\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\7\7\1\u0126\31\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\17\7\1\u0127\21\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\15\7\1\u0128"+ - "\23\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\276\15\7\1\u0129\22\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\u012a\2\7\1\244\1\7\1\244"+ - "\3\7\1\316\3\7\1\u012b\14\7\1\244\4\7\1\u012c"+ - "\1\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\7\1\u012d\37\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\13\7\1\u012e\25\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\u012f\7\7\1\u0130\30\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\3\7"+ - "\1\316\2\7\1\u0131\4\7\1\u0132\3\7\1\316\21\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\1\u0133"+ - "\7\7\1\u0134\20\7\1\u0135\7\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\316\4\7\1\u0136"+ - "\6\7\1\316\21\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\31\7\1\244\3\7\1\u0137\3\7\1\0"+ - "\11\7\12\0\4\7\1\0\1\110\2\7\1\52\22\7"+ - "\5\110\12\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\1\244\40\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\6\7\1\315\30\7\1\u0138\1\7\1\0"+ - "\11\7\12\0\4\7\1\0\2\7\1\u0139\1\52\15\7"+ - "\1\u013a\23\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\3\7\1\321\35\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\32\7\1\54\6\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\14\7\1\u0139\24\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\17\7"+ - "\1\146\21\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\16\7\1\u013b\22\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\16\7\1\222\22\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\7\7\1\u013c\21\7"+ - "\1\u0135\7\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\2\244\37\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\2\244\2\7\1\244\10\7\1\244\23\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\11\7"+ - "\1\244\3\7\1\244\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\7\1\244\37\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\7\1\244\1\7"+ - "\2\244\4\7\1\244\3\7\1\244\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\2\7\1\u013d\1\52\11\7\1\244"+ - "\3\7\1\244\23\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\1\7\1\244\2\240\1\244\1\240\1\7"+ - "\1\240\2\244\3\7\1\244\22\7\1\244\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\15\7\2\244\22\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\10\7"+ - "\1\273\5\7\1\244\22\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\7\7\1\146\31\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\17\7\1\u013e\21\7"+ - "\1\0\11\7\12\0\4\7\1\0\2\7\1\124\1\52"+ - "\1\55\4\7\1\u013f\1\7\1\56\1\7\1\u0140\17\7"+ - "\1\u0141\7\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\1\7\1\u0142\37\7\1\0\11\7\66\0\1\u0143"+ - "\5\0\1\u0144\67\0\1\u0144\102\0\1\u0145\70\0\1\u0146"+ - "\1\0\1\u0147\17\0\4\7\1\0\3\7\1\52\2\7"+ - "\1\u0148\36\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\4\7\1\u0117\34\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\6\7\1\316\32\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\35\7\1\u0149\3\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\2\7"+ - "\1\316\36\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\3\7\1\u014a\35\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\u014b\40\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\316\40\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\5\7\1\u014c\33\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\33\7"+ - "\1\54\5\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\1\7\1\326\37\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\15\7\1\244\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\5\7\1\u014d\33\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\17\7"+ - "\1\54\21\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\3\7\1\244\26\7\1\244\2\7\1\244\1\7"+ - "\1\u014e\1\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\10\7\1\u014f\30\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\15\7\1\316\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\33\7\1\244\5\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\2\7"+ - "\1\244\36\7\1\0\11\7\12\0\4\7\1\0\2\7"+ - "\1\u0150\1\52\41\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\244\26\7\1\244\6\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\12\7\1\244"+ - "\26\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\14\7\1\u0151\24\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\244\1\7\1\244\7\7\1\u012b"+ - "\14\7\1\244\6\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\6\7\1\244\6\7\1\244\23\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\3\7\1\244"+ - "\26\7\1\244\2\7\1\244\3\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\14\7\1\u0152\24\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\7\7\1\u0153"+ - "\31\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\3\7\1\244\1\7\1\244\24\7\1\244\2\7\1\244"+ - "\3\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\7\7\1\u014b\31\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\4\7\1\u0154\34\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\244\1\7\1\244"+ - "\2\7\1\311\4\7\1\311\14\7\1\244\2\7\1\244"+ - "\3\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\7\1\u0155\4\7\1\u0156\7\7\1\u0134\14\7\1\u0157"+ - "\5\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\15\7\1\u0111\23\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\244\1\7\1\244\2\7\1\311"+ - "\3\7\1\u0158\15\7\1\244\2\7\1\244\3\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\3\7\1\244"+ - "\35\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\17\7\1\244\21\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\1\u0159\40\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\3\7\1\244\3\7\1\305\2\7"+ - "\1\312\17\7\1\244\2\7\1\244\3\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\6\7\1\u015a\32\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\33\7"+ - "\1\u015b\5\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\15\7\1\315\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\6\7\1\u015c\32\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\2\7\1\u015d\36\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\31\7"+ - "\1\u015e\7\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\7\7\1\u015f\31\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\10\7\1\u0160\30\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\6\7\1\146\2\7"+ - "\1\u0161\27\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\14\7\1\344\24\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\31\7\1\u0162\7\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\7\7\1\u0163\31\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\13\7"+ - "\1\u0164\25\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\11\7\1\u0165\3\7\1\u0166\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\16\7\1\u0167\22\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\7\7"+ - "\1\u0168\3\7\1\325\2\7\1\u0169\22\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\10\7\1\u016a\30\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\27\7"+ - "\1\330\11\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\3\7\1\u016b\35\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\6\7\1\u016c\32\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\5\7\1\u015a\33\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\3\7"+ - "\1\u016b\3\7\1\305\31\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\13\7\1\u016d\25\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\7\7\1\123\31\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\15\7"+ - "\1\u016e\23\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\12\7\1\u0167\26\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\12\7\1\u016f\26\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\37\7\1\u0170\1\7"+ - "\1\0\11\7\12\0\4\7\1\0\2\7\1\u0171\1\52"+ - "\6\7\1\u0172\32\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\u0173\35\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\14\7\1\u0171\24\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\16\7\1\u0174"+ - "\22\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\3\7\1\273\35\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\16\7\1\146\22\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\24\7\1\u0175\14\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\37\7\1\u0176"+ - "\1\7\1\0\11\7\12\0\4\7\1\0\2\7\1\u0177"+ - "\1\52\3\7\1\244\1\7\1\244\2\7\1\311\4\7"+ - "\1\u0178\14\7\1\244\2\7\1\244\3\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\u0179\7\7\1\u017a"+ - "\4\7\1\u017b\23\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\17\7\1\u017c\21\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\31\7\1\244\7\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\27\7\1\146"+ - "\11\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\7\7\1\u017d\31\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\15\7\1\u017e\23\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\7\1\u017f\1\7\1\u0180"+ - "\4\7\1\u0181\1\u0182\10\7\1\244\15\7\1\244\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\11\7\1\u0183"+ - "\27\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\37\7\1\u0184\1\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\6\7\1\u0185\32\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\7\7\1\u0169\31\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\1\u0108\40\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\1\7"+ - "\1\u0186\37\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\1\7\1\u0168\37\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\15\7\1\244\13\7\1\u0187\7\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\4\7"+ - "\1\u0188\34\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\1\7\1\315\37\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\4\7\1\u0189\34\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\11\7\1\u018a\27\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\10\7"+ - "\1\244\30\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\1\7\1\u017f\7\7\1\u0182\3\7\1\u0182\23\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\37\7"+ - "\1\315\1\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\7\7\1\u018b\31\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\5\7\1\u0184\33\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\14\7\1\u018c\24\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\17\7"+ - "\1\222\21\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\11\7\1\u0183\4\7\1\222\22\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\6\7\1\u018d\32\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\1\124"+ - "\40\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\31\7\1\u018e\7\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\37\7\1\u018f\1\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\u0185\35\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\23\7\1\u0190"+ - "\15\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\11\7\1\u0191\27\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\6\7\1\u0192\32\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\u0193\16\7\1\u0194\21\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\17\7"+ - "\1\u0195\21\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\10\7\1\u0196\30\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\7\1\141\1\u0197\1\u0198\1\u0199"+ - "\3\7\1\u019a\1\u0199\2\7\1\315\12\7\1\u0181\1\7"+ - "\1\u0181\7\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\12\7\1\u0158\26\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\10\7\1\u019b\30\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\u0139\40\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\11\7\1\u019c"+ - "\5\7\1\u019d\21\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\37\7\1\316\1\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\244\1\7\1\244"+ - "\24\7\1\244\6\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\u019e\2\7\1\244\32\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\1\312\40\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\3\7"+ - "\1\u019f\35\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\12\7\1\312\26\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\14\7\1\244\24\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\7\7\1\u01a0\31\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\14\7"+ - "\1\u01a1\24\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\15\7\1\u0161\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\31\7\1\u0161\7\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\15\7\1\326\23\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\10\7"+ - "\1\274\4\7\1\274\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\17\7\1\u01a2\21\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\3\7\1\u01a3\1\u01a4"+ - "\1\u01a5\1\u01a6\1\u0158\3\7\1\u0158\1\u01a7\1\u0178\11\7"+ - "\1\u01a8\1\7\1\u01a9\1\u01aa\2\7\1\u01ab\3\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\10\7\1\311"+ - "\4\7\1\311\23\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\33\7\1\u01ac\5\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\14\7\1\u01ad\24\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\10\7\1\u01ae"+ - "\30\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\40\7\1\312\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\17\7\1\244\12\7\1\244\6\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\17\7\1\u01af\21\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\31\7"+ - "\1\u01b0\7\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\4\7\1\364\34\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\17\7\1\u01b1\21\7\1\0\11\7"+ - "\67\0\1\u01b2\100\0\1\u01b3\77\0\1\u01b4\73\0\1\u01b5"+ - "\100\0\1\u01b6\12\0\4\7\1\0\3\7\1\52\16\7"+ - "\1\u0169\22\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\13\7\1\u01b7\25\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\7\1\u01b8\37\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\15\7\1\u01b9\23\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\3\7"+ - "\1\u014b\35\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\1\7\1\312\37\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\7\1\141\12\7\1\315\24\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\11\7"+ - "\1\u0135\27\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\11\7\1\315\27\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\6\7\1\305\32\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\10\7\1\u01ba\30\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\33\7"+ - "\1\u01bb\5\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\14\7\1\u01bc\24\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\7\1\u01bc\37\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\7\1\u01bd\37\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\10\7"+ - "\1\311\30\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\17\7\1\u0182\21\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\3\7\1\244\1\7\1\244\5\7"+ - "\1\u01be\1\7\1\u015d\14\7\1\244\2\7\1\244\3\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\13\7"+ - "\1\u01bf\1\7\1\u01c0\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\3\7\1\244\1\7\1\244\5\7"+ - "\1\u01be\1\244\1\u015d\14\7\1\244\6\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\5\7\1\244\24\7"+ - "\1\244\6\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\13\7\1\u01c1\25\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\317\40\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\7\1\u01c2\1\u01c3\36\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\11\7"+ - "\1\244\27\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\10\7\1\u01c4\30\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\11\7\1\u0161\27\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\5\7\1\u01c5\33\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\10\7"+ - "\1\u01c6\30\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\35\7\1\u01c7\3\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\3\7\1\244\2\7\1\244\23\7"+ - "\1\244\6\7\1\0\11\7\12\0\4\7\1\0\2\7"+ - "\1\244\1\52\41\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\11\7\1\u01c8\27\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\2\244\1\7\1\141"+ - "\23\7\1\244\2\7\1\244\3\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\5\7\1\u0182\33\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\12\7\1\u01c9"+ - "\26\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\17\7\1\u01ca\21\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\1\7\1\u01cb\37\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\31\7\1\u01cc\7\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\13\7\1\u01cd"+ - "\1\7\1\u0182\23\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\6\7\1\u01ce\32\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\u0182\7\7\1\u01cf"+ - "\13\7\1\u01d0\11\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\15\7\1\311\23\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\23\7\1\u01d1\15\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\3\7\1\u0124"+ - "\26\7\1\u0124\2\7\1\u0124\3\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\11\7\1\u01d2\27\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\3\7\1\244"+ - "\1\7\2\244\6\7\1\244\14\7\1\244\2\7\1\244"+ - "\3\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\10\7\1\u01d3\4\7\1\u01d4\23\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\u01d5\2\7\1\u01d6"+ - "\6\7\1\u01d7\23\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\u01d8\2\7\1\u01d9\6\7\1\u01da"+ - "\17\7\1\u01d8\3\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\7\7\1\u01db\31\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\37\7\1\u01dc\1\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\1\u01dd\40\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\14\7"+ - "\1\u01de\24\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\2\7\1\u01df\11\7\1\u01df\6\7\1\u0197\15\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\16\7"+ - "\1\244\22\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\32\7\1\244\6\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\15\7\1\u01e0\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\3\7\1\244\2\7"+ - "\1\u01e1\3\7\1\244\4\7\1\u0185\12\7\1\244\6\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\3\7"+ - "\1\244\2\7\1\u01e1\3\7\1\244\17\7\1\244\6\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\31\7"+ - "\1\u01e2\7\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\3\7\1\u01e1\1\7\1\u01e1\1\u01e3\3\7\1\u01e1"+ - "\3\7\1\u01e1\13\7\1\u01e1\6\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\37\7\1\u01e4\1\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\31\7\1\u01e5"+ - "\7\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\6\7\1\337\32\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\315\35\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\11\7\1\u01e6\27\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\16\7\1\u01e7"+ - "\22\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\22\7\1\244\16\7\1\0\11\7\12\0\4\7\1\0"+ - "\2\7\1\u01e1\1\52\3\7\1\u01e1\1\7\2\u01e1\3\7"+ - "\1\u01e1\17\7\1\u01e1\4\7\1\u01e1\1\7\1\0\11\7"+ - "\12\0\4\7\1\0\2\7\1\u01e8\1\52\41\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\33\7\1\u01e9"+ - "\5\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\11\7\1\u01ea\27\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\17\7\1\u01bb\21\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\4\7\1\u01eb\34\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\7\7\1\u01ec"+ - "\31\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\3\7\1\u01ed\35\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\2\244\13\7\1\244\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\3\7\1\244\5\7"+ - "\1\244\3\7\1\244\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\2\7\1\274\36\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\7\7\1\u01ee\31\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\1\7"+ - "\1\222\37\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\10\7\1\303\30\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\3\7\1\244\1\7\1\244\16\7"+ - "\1\141\5\7\1\244\2\7\1\244\3\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\u01ef\40\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\6\7\1\u0139"+ - "\32\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\u0136\40\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\10\7\1\311\16\7\1\u01f0\5\7\1\u01f1\3\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\7\7"+ - "\1\244\3\7\1\244\25\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\3\7\1\u01f1\26\7\1\u01f1\2\7"+ - "\1\u01f1\3\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\35\7\1\u01f2\3\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\u01f3\40\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\u01f0\2\7\1\u01f4"+ - "\1\7\1\311\30\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\15\7\1\u01f5\23\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\u01f1\31\7\1\u01f1"+ - "\3\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\3\7\1\244\1\u01f6\34\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\31\7\1\u01f7\7\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\37\7\1\146\1\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\10\7"+ - "\1\u01f8\30\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\4\7\1\u01f9\34\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\10\7\1\u01fa\30\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\4\7\1\u01fb\34\7"+ - "\1\0\11\7\70\0\1\u01fc\100\0\1\u01fd\67\0\1\u01fe"+ - "\75\0\1\u01fd\103\0\1\u01ff\14\0\4\7\1\0\3\7"+ - "\1\52\16\7\1\u0200\22\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\7\7\1\333\31\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\15\7\1\u01bb\23\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\3\7"+ - "\1\244\31\7\1\244\3\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\11\7\1\u0201\27\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\36\7\1\u0202\2\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\15\7"+ - "\1\u015d\23\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\15\7\1\u0203\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\15\7\1\u0204\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\3\7\1\u0205\35\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\35\7"+ - "\1\u012b\3\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\1\u012b\40\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\1\7\1\141\1\u0197\36\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\16\7\1\u0206\22\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\16\7"+ - "\1\u0207\1\222\21\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\33\7\1\u0208\5\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\u0209\1\7\2\244"+ - "\20\7\1\u0182\2\7\1\244\6\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\6\7\1\244\23\7\1\244"+ - "\2\7\1\244\3\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\1\u020a\40\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\15\7\1\u020b\23\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\5\7\1\244\33\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\32\7"+ - "\1\325\6\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\3\7\1\141\35\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\13\7\1\u0182\3\7\1\u0182\12\7"+ - "\1\244\6\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\5\7\1\244\27\7\1\244\3\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\27\7\1\u020c\11\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\6\7"+ - "\1\u020d\6\7\1\u020d\23\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\6\7\1\u020e\6\7\1\u020e\23\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\23\7"+ - "\1\u0158\15\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\23\7\1\u020f\15\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\23\7\1\u0210\15\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\23\7\1\u0174\15\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\23\7"+ - "\1\u0211\15\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\23\7\1\u0212\15\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\11\7\1\222\27\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\7\1\u0213\37\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\4\7"+ - "\1\u0214\34\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\37\7\1\244\1\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\23\7\1\244\15\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\u0111\40\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\10\7\1\u01e1"+ - "\30\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\7\1\141\1\7\1\274\5\7\1\u0199\1\7\1\u0169"+ - "\1\u0215\12\7\1\u0181\11\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\10\7\1\u01e1\5\7\1\u01e1\22\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\4\7"+ - "\1\274\34\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\14\7\1\222\24\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\10\7\1\u018e\30\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\3\7\1\u0158\23\7"+ - "\1\u0158\11\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\1\u0216\40\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\12\7\1\u01bb\26\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\31\7\1\u0217\7\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\16\7\1\u0218"+ - "\22\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\3\7\1\325\35\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\7\7\1\u01bb\31\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\10\7\1\274\30\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\15\7\1\u0168"+ - "\22\7\1\u0168\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\23\7\1\141\15\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\4\7\1\244\1\7\1\141\1\7"+ - "\1\311\5\7\1\u01ba\10\7\1\146\5\7\1\244\3\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\33\7"+ - "\1\u0158\5\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\40\7\1\u0168\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\4\7\1\u0219\34\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\7\1\u0193\37\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\7\7\1\u021a"+ - "\31\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\7\1\u021b\37\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\13\7\1\u021c\25\7\1\0\11\7\71\0"+ - "\1\u021d\100\0\1\u01ff\67\0\1\u01b6\21\0\4\7\1\0"+ - "\3\7\1\52\17\7\1\315\21\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\u021e\35\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\2\7\1\u021f"+ - "\36\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\32\7\1\u01cd\6\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\u0182\26\7\1\u01cd\6\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\35\7\1\u0220"+ - "\3\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\1\u018e\22\7\1\222\15\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\u018e\40\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\u0221\23\7\1\u0221"+ - "\11\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\11\7\1\u0222\27\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\33\7\1\u01cd\5\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\2\7\1\u0223\36\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\23\7\1\123"+ - "\15\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\23\7\1\u0224\15\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\10\7\1\u0225\30\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\10\7\1\u0226\30\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\15\7\1\u0227"+ - "\23\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\15\7\1\u0228\23\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\30\7\1\u0229\10\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\17\7\1\u0213\21\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\1\7\1\244"+ - "\11\7\1\244\25\7\1\0\11\7\12\0\4\7\1\0"+ - "\2\7\1\u0218\1\52\41\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\7\1\u01bb\37\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\1\u01bb\40\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\37\7\1\u022a"+ - "\1\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\6\7\1\u022b\32\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\35\7\1\u01cd\3\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\10\7\1\u022c\30\7\1\0"+ - "\11\7\72\0\1\u01b6\15\0\4\7\1\0\3\7\1\52"+ - "\7\7\1\152\31\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\1\7\1\u022d\37\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\6\7\1\141\32\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\3\7\1\141"+ - "\1\7\1\u0182\24\7\1\325\2\7\1\u0220\3\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\27\7\1\u022e"+ - "\11\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\3\7\1\244\1\7\1\244\12\7\1\u01cd\11\7\1\244"+ - "\2\7\1\244\3\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\15\7\1\u01ba\23\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\244\11\7\1\244"+ - "\23\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\3\7\1\244\2\7\1\244\32\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\3\7\1\244\11\7\1\244"+ - "\17\7\1\244\3\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\3\7\1\244\2\7\1\244\26\7\1\244"+ - "\3\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\25\7\1\244\13\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\4\7\1\u022f\1\7\1\u0230\26\7\1\244"+ - "\3\7\1\0\11\7\12\0\4\7\1\0\3\7\1\52"+ - "\11\7\1\u0231\27\7\1\0\11\7\12\0\4\7\1\0"+ - "\3\7\1\52\10\7\1\272\30\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\14\7\1\u0232\24\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\1\u0233\13\7"+ - "\1\u0234\24\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\13\7\1\244\25\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\35\7\1\u022f\3\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\7\7\1\u0235\31\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\7\7"+ - "\1\u0236\31\7\1\0\11\7\12\0\4\7\1\0\1\244"+ - "\2\7\1\52\22\7\2\244\15\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\1\u0237\40\7\1\0\11\7"+ - "\12\0\4\7\1\0\3\7\1\52\15\7\1\u0238\23\7"+ - "\1\0\11\7\12\0\4\7\1\0\3\7\1\52\15\7"+ - "\1\u0239\23\7\1\0\11\7\12\0\4\7\1\0\3\7"+ - "\1\52\7\7\1\244\31\7\1\0\11\7\12\0\4\7"+ - "\1\0\3\7\1\52\1\u01cd\40\7\1\0\11\7\12\0"+ - "\4\7\1\0\3\7\1\52\15\7\1\u023a\23\7\1\0"+ - "\11\7\12\0\4\7\1\0\3\7\1\52\16\7\1\152"+ - "\22\7\1\0\11\7\4\0"; - - private static int [] zzUnpackTrans() { - int [] result = new int[33728]; - int offset = 0; - offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackTrans(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - value--; - do result[j++] = value; while (--count > 0); - } - return j; - } - - - /* error codes */ - private static final int ZZ_UNKNOWN_ERROR = 0; - private static final int ZZ_NO_MATCH = 1; - private static final int ZZ_PUSHBACK_2BIG = 2; - private static final char[] EMPTY_BUFFER = new char[0]; - private static final int YYEOF = -1; - private static Reader zzReader; // Fake - - /* error messages for the codes above */ - private static final String ZZ_ERROR_MSG[] = { - "Unkown internal scanner error", - "Error: could not match input", - "Error: pushback value was too large" - }; - - /** - * ZZ_ATTRIBUTE[aState] contains the attributes of state aState - */ - private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); - - private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\1\0\1\11\1\1\1\11\4\1\1\11\31\1\2\11"+ - "\3\1\1\0\2\11\1\0\177\1\4\0\224\1\5\0"+ - "\152\1\5\0\105\1\3\0\1\11\35\1\1\0\35\1"; - - private static int [] zzUnpackAttribute() { - int [] result = new int[570]; - int offset = 0; - offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackAttribute(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; - } - - /** the current state of the DFA */ - private int zzState; - - /** the current lexical state */ - private int zzLexicalState = YYINITIAL; - - /** this buffer contains the current text to be matched and is - the source of the yytext() string */ - private CharSequence zzBuffer = ""; - - /** this buffer may contains the current text array to be matched when it is cheap to acquire it */ - private char[] zzBufferArray; - - /** the textposition at the last accepting state */ - private int zzMarkedPos; - - /** the textposition at the last state to be included in yytext */ - private int zzPushbackPos; - - /** the current text position in the buffer */ - private int zzCurrentPos; - - /** startRead marks the beginning of the yytext() string in the buffer */ - private int zzStartRead; - - /** endRead marks the last character in the buffer, that has been read - from input */ - private int zzEndRead; - - /** - * zzAtBOL == true <=> the scanner is currently at the beginning of a line - */ - private boolean zzAtBOL = true; - - /** zzAtEOF == true <=> the scanner is at the EOF */ - private boolean zzAtEOF; - - /* user code: */ - public _AsmIntelHighlightingLexer() { - this(null); - } - - - /** - * Creates a new scanner - * - * @param in the java.io.Reader to read input from. - */ - public _AsmIntelHighlightingLexer(Reader in) { - zzReader = in; - } - - - /** - * Unpacks the compressed character translation table. - * - * @param packed the packed character translation table - * @return the unpacked character translation table - */ - private static char [] zzUnpackCMap(String packed) { - char [] map = new char[0x10000]; - int i = 0; /* index in packed string */ - int j = 0; /* index in unpacked array */ - while (i < 1768) { - int count = packed.charAt(i++); - char value = packed.charAt(i++); - do map[j++] = value; while (--count > 0); - } - return map; - } - - @Override - public final int getTokenStart(){ - return zzStartRead; - } - - @Override - public final int getTokenEnd(){ - return getTokenStart() + yylength(); - } - - @Override - public void reset(CharSequence buffer, int start, int end, int initialState){ - zzBuffer = buffer; - zzBufferArray = CharArrayUtil.fromSequenceWithoutCopying(buffer); - zzCurrentPos = zzMarkedPos = zzStartRead = start; - zzPushbackPos = 0; - zzAtEOF = false; - zzAtBOL = true; - zzEndRead = end; - yybegin(initialState); - } - - /** - * Refills the input buffer. - * - * @return false, iff there was new input. - * - * @exception IOException if any I/O-Error occurs - */ - private boolean zzRefill() throws IOException { - return true; - } - - - /** - * Returns the current lexical state. - */ - @Override - public final int yystate() { - return zzLexicalState; - } - - - /** - * Enters a new lexical state - * - * @param newState the new lexical state - */ - @Override - public final void yybegin(int newState) { - zzLexicalState = newState; - } - - - /** - * Returns the text matched by the current regular expression. - */ - public final CharSequence yytext() { - return zzBuffer.subSequence(zzStartRead, zzMarkedPos); - } - - - /** - * Returns the character at position pos from the - * matched text. - * - * It is equivalent to yytext().charAt(pos), but faster - * - * @param pos the position of the character to fetch. - * A value from 0 to yylength()-1. - * - * @return the character at position pos - */ - public final char yycharat(int pos) { - return zzBufferArray != null ? zzBufferArray[zzStartRead+pos]:zzBuffer.charAt(zzStartRead+pos); - } - - - /** - * Returns the length of the matched text region. - */ - public final int yylength() { - return zzMarkedPos-zzStartRead; - } - - - /** - * Reports an error that occured while scanning. - * - * In a wellformed scanner (no or only correct usage of - * yypushback(int) and a match-all fallback rule) this method - * will only be called with things that "Can't Possibly Happen". - * If this method is called, something is seriously wrong - * (e.g. a JFlex bug producing a faulty scanner etc.). - * - * Usual syntax/scanner level error handling should be done - * in error fallback rules. - * - * @param errorCode the code of the errormessage to display - */ - private void zzScanError(int errorCode) { - String message; - try { - message = ZZ_ERROR_MSG[errorCode]; - } - catch (ArrayIndexOutOfBoundsException e) { - message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; - } - - throw new Error(message); - } - - - /** - * Pushes the specified amount of characters back into the input stream. - * - * They will be read again by then next call of the scanning method - * - * @param number the number of characters to be read again. - * This number must not be greater than yylength()! - */ - public void yypushback(int number) { - if ( number > yylength() ) - zzScanError(ZZ_PUSHBACK_2BIG); - - zzMarkedPos -= number; - } - - - /** - * Resumes scanning until the next regular expression is matched, - * the end of input is encountered or an I/O-Error occurs. - * - * @return the next token - * @exception IOException if any I/O-Error occurs - */ - @Override - public IElementType advance() throws IOException { - int zzInput; - int zzAction; - - // cached fields: - int zzCurrentPosL; - int zzMarkedPosL; - int zzEndReadL = zzEndRead; - CharSequence zzBufferL = zzBuffer; - char[] zzBufferArrayL = zzBufferArray; - char [] zzCMapL = ZZ_CMAP; - - int [] zzTransL = ZZ_TRANS; - int [] zzRowMapL = ZZ_ROWMAP; - int [] zzAttrL = ZZ_ATTRIBUTE; - - while (true) { - zzMarkedPosL = zzMarkedPos; - - zzAction = -1; - - zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; - - zzState = ZZ_LEXSTATE[zzLexicalState]; - - - zzForAction: { - while (true) { - - if (zzCurrentPosL < zzEndReadL) - zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++); - else if (zzAtEOF) { - zzInput = YYEOF; - break zzForAction; - } - else { - // store back cached positions - zzCurrentPos = zzCurrentPosL; - zzMarkedPos = zzMarkedPosL; - boolean eof = zzRefill(); - // get translated positions and possibly new buffer - zzCurrentPosL = zzCurrentPos; - zzMarkedPosL = zzMarkedPos; - zzBufferL = zzBuffer; - zzEndReadL = zzEndRead; - if (eof) { - zzInput = YYEOF; - break zzForAction; - } - else { - zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++); - } - } - int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; - if (zzNext == -1) break zzForAction; - zzState = zzNext; - - int zzAttributes = zzAttrL[zzState]; - if ( (zzAttributes & 1) == 1 ) { - zzAction = zzState; - zzMarkedPosL = zzCurrentPosL; - if ( (zzAttributes & 8) == 8 ) break zzForAction; - } - - } - } - - // store back cached position - zzMarkedPos = zzMarkedPosL; - - switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { - case 17: - return FLAG; - case 19: break; - case 7: - return COMMA; - case 20: break; - case 5: - return INT; - case 21: break; - case 8: - return LINE_COMMENT; - case 22: break; - case 11: - return REGISTER; - case 23: break; - case 4: - return IDENTIFIER; - case 24: break; - case 10: - return LABEL; - case 25: break; - case 1: - return TokenType.BAD_CHARACTER; - case 26: break; - case 14: - return HEX; - case 27: break; - case 18: - return PREPROCESSOR; - case 28: break; - case 2: - return TokenType.WHITE_SPACE; - case 29: break; - case 3: - return OPERATOR; - case 30: break; - case 16: - return DIRECTIVE; - case 31: break; - case 15: - return PSEUDO_INS; - case 32: break; - case 9: - return STRING; - case 33: break; - case 6: - return PAREN; - case 34: break; - case 13: - return INSTRUCTION; - case 35: break; - case 12: - return PSEUDO_REG; - case 36: break; - default: - if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { - zzAtEOF = true; - return null; - } - else { - zzScanError(ZZ_NO_MATCH); - } - } - } - } - - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/lexer/_AsmIntelLexer.java b/plan9/gen/com/plan9/intel/lang/core/lexer/_AsmIntelLexer.java deleted file mode 100644 index 014d68f0ec..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/lexer/_AsmIntelLexer.java +++ /dev/null @@ -1,1274 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* The following code was generated by JFlex 1.4.3 on 3/26/16 7:42 PM */ - -package com.plan9.intel.lang.core.lexer; - -import com.intellij.lexer.FlexLexer; -import com.intellij.psi.TokenType; -import com.intellij.psi.tree.IElementType; -import com.intellij.util.text.CharArrayUtil; -import com.plan9.intel.lang.core.psi.AsmIntelTypes; - -import java.io.IOException; -import java.io.Reader; - -import static com.plan9.intel.lang.core.AsmIntelParserDefinition.LINE_COMMENT; - - -/** - * This class is a scanner generated by - * JFlex 1.4.3 - * on 3/26/16 7:42 PM from the specification file - * /Users/zolotov/dev/intellij-plugins/intellij-go/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelLexer.flex - */ -public class _AsmIntelLexer implements FlexLexer, AsmIntelTypes { - /** initial size of the lookahead buffer */ - private static final int ZZ_BUFFERSIZE = 16384; - - /** lexical states */ - public static final int YYINITIAL = 0; - - /** - * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l - * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l - * at the beginning of a line - * l is of the form l = 2*k, k a non negative integer - */ - private static final int ZZ_LEXSTATE[] = { - 0, 0 - }; - - /** - * Translates characters to character classes - */ - private static final String ZZ_CMAP_PACKED = - "\11\0\1\3\1\1\1\0\1\2\1\1\22\0\1\3\1\0\1\5"+ - "\1\55\4\0\1\64\1\65\2\0\1\66\2\0\1\4\1\12\1\50"+ - "\1\47\1\54\1\53\1\11\1\52\1\11\1\51\1\11\1\15\6\0"+ - "\1\23\1\22\1\20\1\24\1\37\1\16\1\45\1\43\1\40\1\30"+ - "\1\46\1\26\1\25\1\31\1\33\1\17\1\41\1\32\1\21\1\35"+ - "\1\34\1\42\1\27\1\14\1\36\1\44\4\0\1\6\1\0\6\10"+ - "\2\6\1\56\3\6\1\57\1\6\1\61\1\60\1\6\1\62\1\6"+ - "\1\63\3\6\1\13\2\6\1\0\1\67\55\0\1\6\12\0\1\6"+ - "\4\0\1\6\5\0\27\6\1\0\37\6\1\0\u01ca\6\4\0\14\6"+ - "\16\0\5\6\7\0\1\6\1\0\1\6\201\0\5\6\1\0\2\6"+ - "\2\0\4\6\10\0\1\6\1\0\3\6\1\0\1\6\1\0\24\6"+ - "\1\0\123\6\1\0\213\6\10\0\236\6\11\0\46\6\2\0\1\6"+ - "\7\0\47\6\110\0\33\6\5\0\3\6\55\0\53\6\25\0\12\7"+ - "\4\0\2\6\1\0\143\6\1\0\1\6\17\0\2\6\7\0\2\6"+ - "\12\7\3\6\2\0\1\6\20\0\1\6\1\0\36\6\35\0\131\6"+ - "\13\0\1\6\16\0\12\7\41\6\11\0\2\6\4\0\1\6\5\0"+ - "\26\6\4\0\1\6\11\0\1\6\3\0\1\6\27\0\31\6\107\0"+ - "\1\6\1\0\13\6\127\0\66\6\3\0\1\6\22\0\1\6\7\0"+ - "\12\6\4\0\12\7\1\0\7\6\1\0\7\6\5\0\10\6\2\0"+ - "\2\6\2\0\26\6\1\0\7\6\1\0\1\6\3\0\4\6\3\0"+ - "\1\6\20\0\1\6\15\0\2\6\1\0\3\6\4\0\12\7\2\6"+ - "\23\0\6\6\4\0\2\6\2\0\26\6\1\0\7\6\1\0\2\6"+ - "\1\0\2\6\1\0\2\6\37\0\4\6\1\0\1\6\7\0\12\7"+ - "\2\0\3\6\20\0\11\6\1\0\3\6\1\0\26\6\1\0\7\6"+ - "\1\0\2\6\1\0\5\6\3\0\1\6\22\0\1\6\17\0\2\6"+ - "\4\0\12\7\25\0\10\6\2\0\2\6\2\0\26\6\1\0\7\6"+ - "\1\0\2\6\1\0\5\6\3\0\1\6\36\0\2\6\1\0\3\6"+ - "\4\0\12\7\1\0\1\6\21\0\1\6\1\0\6\6\3\0\3\6"+ - "\1\0\4\6\3\0\2\6\1\0\1\6\1\0\2\6\3\0\2\6"+ - "\3\0\3\6\3\0\14\6\26\0\1\6\25\0\12\7\25\0\10\6"+ - "\1\0\3\6\1\0\27\6\1\0\12\6\1\0\5\6\3\0\1\6"+ - "\32\0\2\6\6\0\2\6\4\0\12\7\25\0\10\6\1\0\3\6"+ - "\1\0\27\6\1\0\12\6\1\0\5\6\3\0\1\6\40\0\1\6"+ - "\1\0\2\6\4\0\12\7\1\0\2\6\22\0\10\6\1\0\3\6"+ - "\1\0\51\6\2\0\1\6\20\0\1\6\21\0\2\6\4\0\12\7"+ - "\12\0\6\6\5\0\22\6\3\0\30\6\1\0\11\6\1\0\1\6"+ - "\2\0\7\6\72\0\60\6\1\0\2\6\14\0\7\6\11\0\12\7"+ - "\47\0\2\6\1\0\1\6\2\0\2\6\1\0\1\6\2\0\1\6"+ - "\6\0\4\6\1\0\7\6\1\0\3\6\1\0\1\6\1\0\1\6"+ - "\2\0\2\6\1\0\4\6\1\0\2\6\11\0\1\6\2\0\5\6"+ - "\1\0\1\6\11\0\12\7\2\0\4\6\40\0\1\6\37\0\12\7"+ - "\26\0\10\6\1\0\44\6\33\0\5\6\163\0\53\6\24\0\1\6"+ - "\12\7\6\0\6\6\4\0\4\6\3\0\1\6\3\0\2\6\7\0"+ - "\3\6\4\0\15\6\14\0\1\6\1\0\12\7\6\0\46\6\1\0"+ - "\1\6\5\0\1\6\2\0\53\6\1\0\u014d\6\1\0\4\6\2\0"+ - "\7\6\1\0\1\6\1\0\4\6\2\0\51\6\1\0\4\6\2\0"+ - "\41\6\1\0\4\6\2\0\7\6\1\0\1\6\1\0\4\6\2\0"+ - "\17\6\1\0\71\6\1\0\4\6\2\0\103\6\45\0\20\6\20\0"+ - "\125\6\14\0\u026c\6\2\0\21\6\1\0\32\6\5\0\113\6\25\0"+ - "\15\6\1\0\4\6\16\0\22\6\16\0\22\6\16\0\15\6\1\0"+ - "\3\6\17\0\64\6\43\0\1\6\4\0\1\6\3\0\12\7\46\0"+ - "\12\7\6\0\130\6\10\0\51\6\1\0\1\6\5\0\106\6\12\0"+ - "\35\6\51\0\12\7\36\6\2\0\5\6\13\0\54\6\25\0\7\6"+ - "\10\0\12\7\46\0\27\6\11\0\65\6\53\0\12\7\6\0\12\7"+ - "\15\0\1\6\135\0\57\6\21\0\7\6\4\0\12\7\51\0\36\6"+ - "\15\0\2\6\12\7\54\6\32\0\44\6\34\0\12\7\3\0\3\6"+ - "\12\7\44\6\153\0\4\6\1\0\4\6\3\0\2\6\11\0\300\6"+ - "\100\0\u0116\6\2\0\6\6\2\0\46\6\2\0\6\6\2\0\10\6"+ - "\1\0\1\6\1\0\1\6\1\0\1\6\1\0\37\6\2\0\65\6"+ - "\1\0\7\6\1\0\1\6\3\0\3\6\1\0\7\6\3\0\4\6"+ - "\2\0\6\6\4\0\15\6\5\0\3\6\1\0\7\6\164\0\1\6"+ - "\15\0\1\6\20\0\15\6\145\0\1\6\4\0\1\6\2\0\12\6"+ - "\1\0\1\6\3\0\5\6\6\0\1\6\1\0\1\6\1\0\1\6"+ - "\1\0\4\6\1\0\13\6\2\0\4\6\5\0\5\6\4\0\1\6"+ - "\64\0\2\6\u0a7b\0\57\6\1\0\57\6\1\0\205\6\6\0\4\6"+ - "\3\0\2\6\14\0\46\6\1\0\1\6\5\0\1\6\2\0\70\6"+ - "\7\0\1\6\20\0\27\6\11\0\7\6\1\0\7\6\1\0\7\6"+ - "\1\0\7\6\1\0\7\6\1\0\7\6\1\0\7\6\1\0\7\6"+ - "\120\0\1\6\u01d5\0\2\6\52\0\5\6\5\0\2\6\4\0\126\6"+ - "\6\0\3\6\1\0\132\6\1\0\4\6\5\0\51\6\3\0\136\6"+ - "\21\0\33\6\65\0\20\6\u0200\0\u19b6\6\112\0\u51cd\6\63\0\u048d\6"+ - "\103\0\56\6\2\0\u010d\6\3\0\20\6\12\7\2\6\24\0\57\6"+ - "\20\0\31\6\10\0\106\6\61\0\11\6\2\0\147\6\2\0\4\6"+ - "\1\0\4\6\14\0\13\6\115\0\12\6\1\0\3\6\1\0\4\6"+ - "\1\0\27\6\35\0\64\6\16\0\62\6\34\0\12\7\30\0\6\6"+ - "\3\0\1\6\4\0\12\7\34\6\12\0\27\6\31\0\35\6\7\0"+ - "\57\6\34\0\1\6\12\7\46\0\51\6\27\0\3\6\1\0\10\6"+ - "\4\0\12\7\6\0\27\6\3\0\1\6\5\0\60\6\1\0\1\6"+ - "\3\0\2\6\2\0\5\6\2\0\1\6\1\0\1\6\30\0\3\6"+ - "\2\0\13\6\7\0\3\6\14\0\6\6\2\0\6\6\2\0\6\6"+ - "\11\0\7\6\1\0\7\6\221\0\43\6\15\0\12\7\6\0\u2ba4\6"+ - "\14\0\27\6\4\0\61\6\u2104\0\u016e\6\2\0\152\6\46\0\7\6"+ - "\14\0\5\6\5\0\1\6\1\0\12\6\1\0\15\6\1\0\5\6"+ - "\1\0\1\6\1\0\2\6\1\0\2\6\1\0\154\6\41\0\u016b\6"+ - "\22\0\100\6\2\0\66\6\50\0\14\6\164\0\5\6\1\0\207\6"+ - "\23\0\12\7\7\0\32\6\6\0\32\6\13\0\131\6\3\0\6\6"+ - "\2\0\6\6\2\0\6\6\2\0\3\6\43\0"; - - /** - * Translates characters to character classes - */ - private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); - - /** - * Translates DFA states to action switch labels. - */ - private static final int [] ZZ_ACTION = zzUnpackAction(); - - private static final String ZZ_ACTION_PACKED_0 = - "\1\0\1\1\2\2\2\1\1\3\2\4\1\3\1\5"+ - "\25\3\1\1\1\6\1\7\1\10\1\11\1\12\1\0"+ - "\1\13\1\14\1\0\12\3\1\15\17\3\1\15\22\3"+ - "\1\15\1\3\1\15\101\3\1\0\1\16\102\3\1\17"+ - "\64\3\1\17\13\3\1\17\7\3\1\0\17\3\1\17"+ - "\25\3\1\17\36\3\1\17\1\3\2\17\1\3\2\17"+ - "\1\3\1\17\15\3\1\20\5\3\1\0\5\3\1\17"+ - "\1\3\2\17\5\3\2\17\1\3\2\17\36\3\1\21"+ - "\22\3\1\0\1\3\1\17\5\3\1\17\14\3\1\17"+ - "\10\3\1\0\17\3\1\22\15\3"; - - private static int [] zzUnpackAction() { - int [] result = new int[522]; - int offset = 0; - offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackAction(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; - } - - - /** - * Translates a state to a row index in the transition table - */ - private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); - - private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\70\0\160\0\70\0\250\0\340\0\u0118\0\u0150"+ - "\0\u0188\0\u01c0\0\70\0\u01f8\0\u0230\0\u0268\0\u02a0\0\u02d8"+ - "\0\u0310\0\u0348\0\u0380\0\u03b8\0\u03f0\0\u0428\0\u0460\0\u0498"+ - "\0\u04d0\0\u0508\0\u0540\0\u0578\0\u05b0\0\u05e8\0\u0620\0\u0658"+ - "\0\u0690\0\70\0\70\0\70\0\70\0\u06c8\0\340\0\70"+ - "\0\70\0\u0700\0\u0738\0\u0770\0\u07a8\0\u07e0\0\u0818\0\u0850"+ - "\0\u0888\0\u08c0\0\u08f8\0\u0930\0\u0968\0\u09a0\0\u09d8\0\u0a10"+ - "\0\u0a48\0\u0a80\0\u0ab8\0\u0af0\0\u0b28\0\u0b60\0\u0b98\0\u0bd0"+ - "\0\u0c08\0\u0c40\0\u0c78\0\u0cb0\0\u0ce8\0\u0d20\0\u0d58\0\u0d90"+ - "\0\u0dc8\0\u0e00\0\u0e38\0\u0e70\0\u0ea8\0\u0ee0\0\u0f18\0\u0f50"+ - "\0\u0f88\0\u0fc0\0\u0ff8\0\u1030\0\u1068\0\u10a0\0\u10d8\0\u0118"+ - "\0\u1110\0\u1148\0\u1180\0\u11b8\0\u11f0\0\u1228\0\u1260\0\u1298"+ - "\0\u12d0\0\u1308\0\u1340\0\u1378\0\u13b0\0\u13e8\0\u1420\0\u1458"+ - "\0\u1490\0\u14c8\0\u1500\0\u1538\0\u1570\0\u15a8\0\u15e0\0\u1618"+ - "\0\u1650\0\u1688\0\u16c0\0\u16f8\0\u1730\0\u1768\0\u17a0\0\u17d8"+ - "\0\u1810\0\u1848\0\u1880\0\u18b8\0\u18f0\0\u1928\0\u1960\0\u1998"+ - "\0\u19d0\0\u1a08\0\u1a40\0\u1a78\0\u1ab0\0\u1ae8\0\u1b20\0\u1b58"+ - "\0\u1b90\0\u1bc8\0\u1c00\0\u1c38\0\u1c70\0\u1ca8\0\u1ce0\0\u1d18"+ - "\0\u1d50\0\u1d88\0\u1dc0\0\u1df8\0\u1e30\0\u1e68\0\u1ea0\0\u1ed8"+ - "\0\u1f10\0\u1f48\0\u1f80\0\u1fb8\0\u0700\0\u1ff0\0\u2028\0\u2060"+ - "\0\u2098\0\u20d0\0\u2108\0\u2140\0\u2178\0\u21b0\0\u21e8\0\u2220"+ - "\0\u2258\0\u2290\0\u22c8\0\u2300\0\u2338\0\u2370\0\u23a8\0\u23e0"+ - "\0\u2418\0\u2450\0\u2488\0\u24c0\0\u24f8\0\u2530\0\u2568\0\u25a0"+ - "\0\u25d8\0\u2610\0\u2648\0\u2680\0\u26b8\0\u26f0\0\u2728\0\u2760"+ - "\0\u2798\0\u27d0\0\u2808\0\u2840\0\u2878\0\u28b0\0\u28e8\0\u2920"+ - "\0\u2958\0\u2990\0\u29c8\0\u2a00\0\u2a38\0\u2a70\0\u2aa8\0\u2ae0"+ - "\0\u2b18\0\u2b50\0\u2b88\0\u2bc0\0\u2bf8\0\u2c30\0\u2c68\0\u2ca0"+ - "\0\u2cd8\0\u2d10\0\u2d48\0\u2d80\0\u2db8\0\u2df0\0\u2e28\0\u0118"+ - "\0\u2e60\0\u2e98\0\u2ed0\0\u2f08\0\u2f40\0\u2f78\0\u2fb0\0\u2fe8"+ - "\0\u3020\0\u3058\0\u3090\0\u30c8\0\u3100\0\u3138\0\u3170\0\u31a8"+ - "\0\u31e0\0\u3218\0\u3250\0\u3288\0\u32c0\0\u32f8\0\u3330\0\u3368"+ - "\0\u33a0\0\u33d8\0\u3410\0\u3448\0\u3480\0\u34b8\0\u34f0\0\u3528"+ - "\0\u3560\0\u3598\0\u35d0\0\u3608\0\u3640\0\u3678\0\u36b0\0\u36e8"+ - "\0\u3720\0\u3758\0\u3790\0\u37c8\0\u3800\0\u3838\0\u3870\0\u38a8"+ - "\0\u38e0\0\u3918\0\u3950\0\u3988\0\u39c0\0\u39f8\0\u3a30\0\u3a68"+ - "\0\u3aa0\0\u3ad8\0\u3b10\0\u3b48\0\u3b80\0\u3bb8\0\u3bf0\0\u3c28"+ - "\0\u1068\0\u3c60\0\u3c98\0\u3cd0\0\u3d08\0\u3d40\0\u3d78\0\u3db0"+ - "\0\u3de8\0\u3e20\0\u3e58\0\u3e90\0\u3ec8\0\u3f00\0\u3f38\0\u3f70"+ - "\0\u39c0\0\u3fa8\0\u3fe0\0\u4018\0\u4050\0\u4088\0\u40c0\0\u40f8"+ - "\0\u4130\0\u4168\0\u41a0\0\u41d8\0\u4210\0\u4248\0\u4280\0\u42b8"+ - "\0\u42f0\0\u4328\0\u4360\0\u4398\0\u43d0\0\u4408\0\u4440\0\u4478"+ - "\0\u44b0\0\u44e8\0\u4520\0\u4558\0\u4590\0\u45c8\0\u4600\0\u4638"+ - "\0\u4670\0\u46a8\0\u46e0\0\u4718\0\u4750\0\u4788\0\u47c0\0\u47f8"+ - "\0\u4830\0\u4868\0\u48a0\0\u48d8\0\u4910\0\u4948\0\u4980\0\u49b8"+ - "\0\u49f0\0\u4a28\0\u4a60\0\u4a98\0\u4ad0\0\u4b08\0\u4b40\0\u4b78"+ - "\0\u4bb0\0\u4be8\0\u4c20\0\u4c58\0\u4c90\0\u4cc8\0\u4d00\0\u4d38"+ - "\0\u4d70\0\u4da8\0\u4de0\0\u4e18\0\u4e50\0\u4e88\0\u4ec0\0\u4ef8"+ - "\0\u4f30\0\u4f68\0\u4fa0\0\u4fd8\0\u5010\0\u5048\0\u5080\0\u50b8"+ - "\0\u50f0\0\u5128\0\u5160\0\u0118\0\u5198\0\u51d0\0\u5208\0\u5240"+ - "\0\u5278\0\u52b0\0\u52e8\0\u5320\0\u5358\0\u5390\0\u53c8\0\u42f0"+ - "\0\u5400\0\u26b8\0\u5438\0\u5470\0\u54a8\0\u54e0\0\u5518\0\u5550"+ - "\0\u5588\0\u55c0\0\u55f8\0\u2840\0\u5630\0\u5668\0\u56a0\0\u56d8"+ - "\0\u5710\0\u5748\0\u5780\0\u57b8\0\u57f0\0\u5828\0\u5860\0\u5898"+ - "\0\u58d0\0\u5908\0\u5940\0\u5978\0\u59b0\0\u59e8\0\u5a20\0\u5a58"+ - "\0\u5a90\0\u5ac8\0\u5b00\0\u5b38\0\u5b70\0\u5ba8\0\u5be0\0\u5c18"+ - "\0\u5c50\0\u5c88\0\u5cc0\0\u0118\0\u5cf8\0\u5d30\0\u5d68\0\u5da0"+ - "\0\u5dd8\0\u5e10\0\u5e48\0\u5e80\0\u5eb8\0\u5ef0\0\u5f28\0\u5f60"+ - "\0\u5f98\0\u5fd0\0\u6008\0\u6040\0\u6078\0\u60b0\0\u60e8\0\u6120"+ - "\0\u6158\0\u6190\0\u61c8\0\u6200\0\u6238\0\u6270\0\u40c0\0\u62a8"+ - "\0\u62e0\0\u6318\0\u6350\0\u6388\0\u63c0\0\u63f8\0\u6430\0\u6468"+ - "\0\u64a0\0\u64d8\0\u6510\0\u6548\0\u6580\0\u65b8\0\u65f0\0\u6628"+ - "\0\u6660\0\u6698\0\u66d0\0\u6708\0\u6740\0\u6778\0\u67b0\0\u67e8"+ - "\0\u6820\0\u6858\0\u6890\0\u68c8\0\u6900\0\u6938\0\u6970\0\u69a8"+ - "\0\u69e0\0\u6a18\0\u6a50\0\u6a88\0\70\0\u6ac0\0\u6af8\0\u4de0"+ - "\0\u6b30\0\u6b68\0\u6ba0\0\u6bd8\0\u6c10\0\u6c48\0\u6c80\0\u6cb8"+ - "\0\u6cf0\0\u6d28"; - - private static int [] zzUnpackRowMap() { - int [] result = new int[522]; - int offset = 0; - offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackRowMap(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int high = packed.charAt(i++) << 16; - result[j++] = high | packed.charAt(i++); - } - return j; - } - - /** - * The transition table of the DFA - */ - private static final int [] ZZ_TRANS = zzUnpackTrans(); - - private static final String ZZ_TRANS_PACKED_0 = - "\1\2\1\3\1\4\1\3\1\5\1\6\1\7\1\2"+ - "\1\7\1\10\1\11\1\7\1\12\1\13\1\14\1\15"+ - "\1\16\1\17\1\20\1\21\1\22\1\23\1\24\1\25"+ - "\1\26\1\27\1\30\1\31\1\32\1\33\1\7\1\34"+ - "\1\35\1\36\1\37\1\40\3\7\6\10\1\41\6\7"+ - "\1\42\1\43\1\44\1\45\71\0\1\3\1\0\1\3"+ - "\70\0\1\46\63\0\5\47\1\50\62\47\6\0\7\7"+ - "\1\51\37\7\1\0\6\7\15\0\2\10\34\0\6\10"+ - "\26\0\2\52\61\0\7\7\1\51\2\7\1\53\1\7"+ - "\1\54\1\55\2\7\1\56\3\7\1\57\1\60\1\7"+ - "\1\61\1\7\1\62\15\7\1\0\6\7\12\0\6\7"+ - "\1\63\1\51\1\64\1\65\1\66\1\67\1\7\1\70"+ - "\1\71\1\72\1\73\2\7\1\74\1\75\1\7\1\76"+ - "\1\77\1\100\1\7\1\101\6\7\1\102\5\7\1\0"+ - "\6\7\12\0\6\7\1\103\1\51\1\104\1\7\1\105"+ - "\1\106\1\7\1\107\1\7\1\110\4\7\1\111\1\112"+ - "\1\113\2\7\1\114\1\115\14\7\1\0\6\7\12\0"+ - "\7\7\1\51\1\7\1\116\4\7\1\117\1\120\1\121"+ - "\1\122\2\7\1\123\1\124\5\7\1\125\1\126\12\7"+ - "\1\0\6\7\12\0\7\7\1\51\1\127\1\130\1\131"+ - "\1\7\1\132\1\133\3\7\1\134\4\7\1\135\1\136"+ - "\1\137\1\140\1\7\1\141\1\7\1\142\11\7\1\0"+ - "\6\7\12\0\7\7\1\51\3\7\1\143\11\7\1\144"+ - "\1\7\1\145\1\146\16\7\1\0\6\7\12\0\7\7"+ - "\1\51\5\7\1\147\1\150\4\7\1\151\1\152\4\7"+ - "\1\153\15\7\1\0\6\7\12\0\7\7\1\51\5\7"+ - "\1\154\10\7\1\155\2\7\1\156\1\157\14\7\1\0"+ - "\6\7\12\0\7\7\1\51\1\127\4\7\1\160\7\7"+ - "\1\161\1\162\3\7\1\163\14\7\1\0\6\7\12\0"+ - "\7\7\1\51\1\127\2\7\1\164\1\7\1\165\1\166"+ - "\6\7\1\167\3\7\1\170\15\7\1\0\6\7\12\0"+ - "\7\7\1\51\4\7\1\171\1\172\6\7\1\173\1\174"+ - "\21\7\1\0\6\7\12\0\7\7\1\51\1\7\1\175"+ - "\1\176\4\7\1\177\1\200\2\7\1\201\1\7\1\202"+ - "\3\7\1\117\3\7\1\177\1\7\1\203\7\7\1\0"+ - "\6\7\12\0\7\7\1\51\15\7\1\204\3\7\1\205"+ - "\15\7\1\0\6\7\12\0\7\7\1\51\2\7\1\206"+ - "\1\207\2\7\1\210\6\7\1\211\3\7\1\212\15\7"+ - "\1\0\6\7\12\0\7\7\1\51\14\7\1\213\1\7"+ - "\1\214\20\7\1\0\6\7\12\0\7\7\1\51\2\7"+ - "\1\215\10\7\1\216\23\7\1\0\6\7\12\0\7\7"+ - "\1\51\10\7\1\217\10\7\1\220\15\7\1\0\6\7"+ - "\12\0\7\7\1\51\7\7\1\221\3\7\1\222\23\7"+ - "\1\0\6\7\12\0\7\7\1\51\6\7\1\223\1\224"+ - "\3\7\1\225\1\226\22\7\1\0\6\7\12\0\7\7"+ - "\1\51\16\7\1\227\20\7\1\0\6\7\12\0\7\7"+ - "\1\51\1\7\1\230\17\7\1\231\4\7\1\232\10\7"+ - "\1\0\6\7\12\0\7\7\1\51\10\7\1\233\26\7"+ - "\1\0\6\7\62\0\1\234\11\0\1\46\1\0\66\46"+ - "\10\0\3\235\3\0\1\235\1\0\1\235\1\0\3\235"+ - "\12\0\1\235\7\0\6\235\21\0\7\7\1\51\25\7"+ - "\1\236\11\7\1\0\6\7\12\0\7\7\1\51\21\7"+ - "\1\237\15\7\1\0\6\7\12\0\7\7\1\51\2\7"+ - "\1\240\1\7\1\241\1\7\1\242\30\7\1\0\6\7"+ - "\12\0\7\7\1\51\5\7\1\233\31\7\1\0\6\7"+ - "\12\0\7\7\1\51\21\7\1\243\15\7\1\0\6\7"+ - "\12\0\7\7\1\51\14\7\1\213\22\7\1\0\6\7"+ - "\12\0\7\7\1\51\21\7\1\77\15\7\1\0\6\7"+ - "\12\0\7\7\1\51\13\7\1\122\23\7\1\0\6\7"+ - "\12\0\7\7\1\51\2\7\1\244\1\245\1\7\1\246"+ - "\6\7\1\247\2\7\1\250\17\7\1\0\6\7\12\0"+ - "\7\7\1\51\14\7\1\251\22\7\1\0\6\7\12\0"+ - "\7\7\1\51\5\7\1\252\6\7\1\253\2\7\1\254"+ - "\17\7\1\0\6\7\12\0\7\7\1\51\7\7\1\255"+ - "\1\256\4\7\1\257\7\7\1\260\11\7\1\0\6\7"+ - "\12\0\7\7\1\51\2\7\1\261\2\7\1\262\10\7"+ - "\1\263\1\264\2\7\1\265\1\266\13\7\1\0\6\7"+ - "\12\0\7\7\1\51\4\7\1\260\1\7\1\267\30\7"+ - "\1\0\6\7\12\0\7\7\1\51\21\7\1\270\1\271"+ - "\14\7\1\0\6\7\12\0\7\7\1\51\15\7\1\272"+ - "\1\273\20\7\1\0\6\7\12\0\7\7\1\51\6\7"+ - "\1\274\30\7\1\0\6\7\12\0\7\7\1\51\15\7"+ - "\1\275\21\7\1\0\6\7\12\0\7\7\1\51\3\7"+ - "\1\276\7\7\1\277\23\7\1\0\6\7\12\0\7\7"+ - "\1\51\2\7\1\300\34\7\1\0\6\7\12\0\7\7"+ - "\1\51\3\7\1\233\33\7\1\0\6\7\12\0\7\7"+ - "\1\51\10\7\1\301\26\7\1\0\6\7\12\0\7\7"+ - "\1\51\13\7\1\302\23\7\1\0\6\7\12\0\6\7"+ - "\1\303\1\51\37\7\1\0\6\7\12\0\7\7\1\51"+ - "\15\7\1\304\21\7\1\0\6\7\12\0\7\7\1\51"+ - "\1\7\1\305\1\306\1\307\1\7\1\310\1\7\1\311"+ - "\3\7\1\312\1\313\14\7\1\314\5\7\1\0\6\7"+ - "\12\0\7\7\1\51\7\7\1\315\1\316\26\7\1\0"+ - "\6\7\12\0\7\7\1\51\5\7\1\317\2\7\1\320"+ - "\1\321\2\7\1\322\1\7\1\323\6\7\1\324\11\7"+ - "\1\0\6\7\12\0\7\7\1\51\2\7\1\325\3\7"+ - "\1\326\4\7\1\327\2\7\1\330\5\7\1\331\12\7"+ - "\1\0\6\7\12\0\7\7\1\51\5\7\1\332\7\7"+ - "\1\333\1\334\3\7\1\335\14\7\1\0\6\7\12\0"+ - "\7\7\1\51\21\7\1\336\15\7\1\0\6\7\12\0"+ - "\7\7\1\51\1\7\1\337\12\7\1\340\22\7\1\0"+ - "\6\7\12\0\7\7\1\51\3\7\1\341\7\7\1\342"+ - "\23\7\1\0\6\7\12\0\6\7\1\343\1\51\37\7"+ - "\1\0\6\7\12\0\7\7\1\51\13\7\1\344\15\7"+ - "\1\345\5\7\1\0\6\7\12\0\7\7\1\51\16\7"+ - "\1\346\20\7\1\0\6\7\12\0\7\7\1\51\23\7"+ - "\1\340\13\7\1\0\6\7\12\0\7\7\1\51\1\7"+ - "\1\347\1\340\12\7\1\350\21\7\1\0\6\7\12\0"+ - "\7\7\1\51\2\7\1\340\3\7\1\340\10\7\1\260"+ - "\2\7\1\340\14\7\1\0\6\7\12\0\7\7\1\51"+ - "\6\7\1\340\30\7\1\0\6\7\12\0\7\7\1\51"+ - "\2\7\1\351\34\7\1\0\6\7\12\0\7\7\1\51"+ - "\7\7\1\352\27\7\1\0\6\7\12\0\7\7\1\51"+ - "\15\7\1\340\21\7\1\0\6\7\12\0\7\7\1\51"+ - "\17\7\1\353\17\7\1\0\6\7\12\0\7\7\1\51"+ - "\21\7\1\354\15\7\1\0\6\7\12\0\7\7\1\51"+ - "\5\7\1\355\31\7\1\0\6\7\12\0\7\7\1\51"+ - "\4\7\1\356\32\7\1\0\6\7\12\0\7\7\1\51"+ - "\10\7\1\356\3\7\1\356\10\7\1\357\11\7\1\0"+ - "\6\7\12\0\7\7\1\51\5\7\1\360\31\7\1\0"+ - "\6\7\12\0\7\7\1\51\4\7\1\361\32\7\1\0"+ - "\6\7\12\0\7\7\1\51\2\7\1\340\3\7\1\340"+ - "\1\362\5\7\1\355\4\7\1\340\14\7\1\0\6\7"+ - "\12\0\7\7\1\51\3\7\1\363\33\7\1\0\6\7"+ - "\12\0\7\7\1\51\17\7\1\364\17\7\1\0\6\7"+ - "\12\0\7\7\1\51\14\7\1\365\22\7\1\0\6\7"+ - "\12\0\7\7\1\51\10\7\1\356\3\7\1\356\1\7"+ - "\1\366\20\7\1\0\6\7\12\0\7\7\1\51\1\367"+ - "\10\7\1\370\2\7\1\367\22\7\1\0\6\7\12\0"+ - "\7\7\1\51\16\7\1\371\20\7\1\0\6\7\12\0"+ - "\7\7\1\51\2\7\2\367\4\7\2\340\2\7\1\367"+ - "\6\7\1\340\13\7\1\0\6\7\12\0\7\7\1\51"+ - "\17\7\1\201\17\7\1\0\6\7\12\0\7\7\1\51"+ - "\3\7\1\340\1\7\3\340\27\7\1\0\6\7\12\0"+ - "\7\7\1\51\2\7\1\356\3\7\1\361\3\7\1\372"+ - "\24\7\1\0\6\7\12\0\7\7\1\51\6\7\1\373"+ - "\30\7\1\0\6\7\12\0\7\7\1\51\1\7\1\374"+ - "\35\7\1\0\6\7\12\0\7\7\1\51\3\7\1\375"+ - "\33\7\1\0\6\7\12\0\7\7\1\51\3\7\1\340"+ - "\1\7\1\340\31\7\1\0\6\7\12\0\7\7\1\51"+ - "\1\7\1\376\35\7\1\0\6\7\12\0\7\7\1\51"+ - "\2\7\1\356\34\7\1\0\6\7\12\0\7\7\1\51"+ - "\24\7\1\361\12\7\1\0\6\7\12\0\6\7\1\377"+ - "\1\51\3\7\1\u0100\33\7\1\0\6\7\12\0\7\7"+ - "\1\51\6\7\1\201\15\7\1\u0101\12\7\1\0\6\7"+ - "\12\0\7\7\1\51\10\7\1\361\26\7\1\0\6\7"+ - "\12\0\7\7\1\51\13\7\1\377\23\7\1\0\6\7"+ - "\12\0\7\7\1\51\10\7\1\u0102\26\7\1\0\6\7"+ - "\12\0\7\7\1\51\3\7\1\233\10\7\1\u0102\10\7"+ - "\1\357\11\7\1\0\6\7\12\0\7\7\1\51\7\7"+ - "\1\362\27\7\1\0\6\7\12\0\7\7\1\51\2\7"+ - "\1\u0103\3\7\1\355\4\7\1\u0104\1\7\1\u0105\21\7"+ - "\1\0\6\7\12\0\7\7\1\51\5\7\1\u0106\31\7"+ - "\1\0\6\7\12\0\7\7\1\51\22\7\1\u0107\14\7"+ - "\1\0\6\7\12\0\7\7\1\51\22\7\1\233\14\7"+ - "\1\0\6\7\12\0\7\7\1\51\5\7\1\u0108\1\7"+ - "\1\u0109\27\7\1\0\6\7\12\0\7\7\1\51\14\7"+ - "\1\122\22\7\1\0\6\7\12\0\7\7\1\51\2\7"+ - "\2\340\4\7\1\340\26\7\1\0\6\7\12\0\6\7"+ - "\1\u010a\1\51\2\7\2\340\33\7\1\0\6\7\12\0"+ - "\7\7\1\51\22\7\1\340\14\7\1\0\6\7\12\0"+ - "\7\7\1\51\3\7\1\340\13\7\1\340\1\7\1\340"+ - "\15\7\1\0\6\7\12\0\7\7\1\51\21\7\1\340"+ - "\15\7\1\0\6\7\12\0\7\7\1\51\2\7\2\340"+ - "\33\7\1\0\6\7\12\0\7\7\1\51\17\7\1\340"+ - "\1\7\1\340\15\7\1\0\6\7\12\0\7\7\1\51"+ - "\1\u010b\1\u010c\1\7\1\u010d\13\7\1\356\17\7\1\0"+ - "\6\7\12\0\7\7\1\51\21\7\1\u010e\5\7\1\356"+ - "\7\7\1\0\6\7\12\0\7\7\1\51\1\7\1\u010f"+ - "\6\7\1\356\3\7\1\356\22\7\1\0\6\7\12\0"+ - "\7\7\1\51\7\7\1\340\13\7\1\u0110\13\7\1\0"+ - "\6\7\12\0\7\7\1\51\1\7\1\u0111\5\7\1\u0109"+ - "\7\7\1\u0112\17\7\1\0\6\7\12\0\7\7\1\51"+ - "\6\7\1\u0113\1\7\1\356\3\7\1\356\1\7\1\u0114"+ - "\20\7\1\0\6\7\12\0\7\7\1\51\1\7\1\u0115"+ - "\15\7\1\u0116\17\7\1\0\6\7\12\0\7\7\1\51"+ - "\1\7\1\u0117\2\7\1\340\3\7\2\340\11\7\1\340"+ - "\13\7\1\0\6\7\12\0\7\7\1\51\17\7\1\u0118"+ - "\17\7\1\0\6\7\12\0\7\7\1\51\15\7\1\124"+ - "\21\7\1\0\6\7\12\0\7\7\1\51\1\7\1\u0119"+ - "\35\7\1\0\6\7\12\0\7\7\1\51\3\7\1\u011a"+ - "\33\7\1\0\6\7\12\0\6\7\1\u011b\1\51\3\7"+ - "\1\u011c\33\7\1\0\6\7\12\0\7\7\1\51\7\7"+ - "\1\260\27\7\1\0\6\7\12\0\7\7\1\51\17\7"+ - "\1\u011d\17\7\1\0\6\7\12\0\7\7\1\51\22\7"+ - "\1\u011e\14\7\1\0\6\7\12\0\7\7\1\51\16\7"+ - "\1\u011f\20\7\1\0\6\7\12\0\7\7\1\51\2\7"+ - "\1\356\1\u0120\1\340\3\7\2\340\5\7\1\u0121\4\7"+ - "\1\u0122\12\7\1\0\6\7\12\0\7\7\1\51\21\7"+ - "\1\u0123\15\7\1\0\6\7\12\0\7\7\1\51\5\7"+ - "\1\122\31\7\1\0\6\7\12\0\6\7\1\103\1\51"+ - "\2\7\1\u0124\1\7\1\u0125\1\62\1\7\1\u0126\7\7"+ - "\1\61\17\7\1\0\6\7\12\0\7\7\1\51\14\7"+ - "\1\u0127\22\7\1\0\6\7\12\0\7\7\1\51\21\7"+ - "\1\u0128\15\7\1\0\6\7\12\0\7\7\1\51\17\7"+ - "\1\340\17\7\1\0\6\7\63\0\1\u0129\16\0\7\7"+ - "\1\51\27\7\1\356\7\7\1\0\6\7\12\0\7\7"+ - "\1\51\27\7\1\u012a\7\7\1\0\6\7\12\0\7\7"+ - "\1\51\23\7\1\u012b\13\7\1\0\6\7\12\0\7\7"+ - "\1\51\15\7\1\266\21\7\1\0\6\7\12\0\7\7"+ - "\1\51\6\7\1\356\30\7\1\0\6\7\12\0\7\7"+ - "\1\51\10\7\1\u012c\26\7\1\0\6\7\12\0\7\7"+ - "\1\51\25\7\1\122\11\7\1\0\6\7\12\0\7\7"+ - "\1\51\5\7\1\u012d\31\7\1\0\6\7\12\0\7\7"+ - "\1\51\7\7\1\340\27\7\1\0\6\7\12\0\7\7"+ - "\1\51\3\7\1\u012e\33\7\1\0\6\7\12\0\7\7"+ - "\1\51\14\7\1\u012f\22\7\1\0\6\7\12\0\7\7"+ - "\1\51\21\7\1\201\15\7\1\0\6\7\12\0\7\7"+ - "\1\51\17\7\1\254\17\7\1\0\6\7\12\0\7\7"+ - "\1\51\21\7\1\u0130\15\7\1\0\6\7\12\0\7\7"+ - "\1\51\5\7\1\u0131\31\7\1\0\6\7\12\0\7\7"+ - "\1\51\15\7\1\u0132\21\7\1\0\6\7\12\0\7\7"+ - "\1\51\21\7\1\u0133\15\7\1\0\6\7\12\0\7\7"+ - "\1\51\3\7\1\340\3\7\1\u0134\27\7\1\0\6\7"+ - "\12\0\7\7\1\51\3\7\1\340\33\7\1\0\6\7"+ - "\12\0\7\7\1\51\5\7\1\u0135\31\7\1\0\6\7"+ - "\12\0\7\7\1\51\24\7\1\201\12\7\1\0\6\7"+ - "\12\0\7\7\1\51\4\7\1\u0136\32\7\1\0\6\7"+ - "\12\0\7\7\1\51\2\7\2\u0137\15\7\1\u0138\15\7"+ - "\1\0\6\7\12\0\7\7\1\51\13\7\1\u0139\23\7"+ - "\1\0\6\7\12\0\7\7\1\51\14\7\1\233\22\7"+ - "\1\0\6\7\12\0\7\7\1\51\6\7\1\u013a\30\7"+ - "\1\0\6\7\12\0\7\7\1\51\2\7\1\u013b\34\7"+ - "\1\0\6\7\12\0\7\7\1\51\24\7\1\u0136\12\7"+ - "\1\0\6\7\12\0\7\7\1\51\24\7\1\u013c\12\7"+ - "\1\0\6\7\12\0\7\7\1\51\10\7\1\u013a\26\7"+ - "\1\0\6\7\12\0\7\7\1\51\1\7\1\177\1\u0137"+ - "\5\7\1\u013d\10\7\1\u0138\4\7\1\340\3\7\1\340"+ - "\4\7\1\0\6\7\12\0\7\7\1\51\1\7\1\340"+ - "\35\7\1\0\6\7\12\0\7\7\1\51\17\7\1\103"+ - "\17\7\1\0\6\7\12\0\7\7\1\51\6\7\1\u013e"+ - "\30\7\1\0\6\7\12\0\7\7\1\51\15\7\1\u013f"+ - "\21\7\1\0\6\7\12\0\7\7\1\51\31\7\1\u0140"+ - "\5\7\1\0\6\7\12\0\7\7\1\51\2\7\1\u013b"+ - "\17\7\1\233\14\7\1\0\6\7\12\0\7\7\1\51"+ - "\7\7\1\u0141\27\7\1\0\6\7\12\0\7\7\1\51"+ - "\14\7\1\340\22\7\1\0\6\7\12\0\7\7\1\51"+ - "\13\7\1\312\23\7\1\0\6\7\12\0\7\7\1\51"+ - "\7\7\1\u0142\27\7\1\0\6\7\12\0\7\7\1\51"+ - "\16\7\1\u0143\20\7\1\0\6\7\12\0\7\7\1\51"+ - "\2\7\1\u0144\3\7\1\122\30\7\1\0\6\7\12\0"+ - "\7\7\1\51\5\7\1\u0133\10\7\1\374\3\7\1\u0131"+ - "\14\7\1\0\6\7\12\0\7\7\1\51\5\7\1\u0145"+ - "\31\7\1\0\6\7\12\0\7\7\1\51\2\7\1\u0146"+ - "\1\u0147\33\7\1\0\6\7\12\0\7\7\1\51\22\7"+ - "\1\u0102\14\7\1\0\6\7\12\0\7\7\1\51\1\7"+ - "\1\u0148\35\7\1\0\6\7\12\0\7\7\1\51\7\7"+ - "\1\u0149\27\7\1\0\6\7\12\0\7\7\1\51\6\7"+ - "\1\u014a\30\7\1\0\6\7\12\0\7\7\1\51\10\7"+ - "\1\u014b\26\7\1\0\6\7\12\0\7\7\1\51\5\7"+ - "\1\152\31\7\1\0\6\7\12\0\7\7\1\51\5\7"+ - "\1\u0102\2\7\1\u014b\26\7\1\0\6\7\12\0\7\7"+ - "\1\51\4\7\1\u014c\32\7\1\0\6\7\12\0\7\7"+ - "\1\51\16\7\1\u014d\20\7\1\0\6\7\12\0\7\7"+ - "\1\51\30\7\1\u014e\6\7\1\0\6\7\12\0\7\7"+ - "\1\51\6\7\1\u014c\30\7\1\0\6\7\12\0\7\7"+ - "\1\51\6\7\1\u014f\30\7\1\0\6\7\12\0\7\7"+ - "\1\51\3\7\1\201\33\7\1\0\6\7\12\0\7\7"+ - "\1\51\27\7\1\u0150\7\7\1\0\6\7\12\0\6\7"+ - "\1\u0151\1\51\6\7\1\u0152\30\7\1\0\6\7\12\0"+ - "\7\7\1\51\24\7\1\u0153\12\7\1\0\6\7\12\0"+ - "\7\7\1\51\10\7\1\u0154\26\7\1\0\6\7\12\0"+ - "\7\7\1\51\13\7\1\u0151\23\7\1\0\6\7\12\0"+ - "\7\7\1\51\1\u0155\36\7\1\0\6\7\12\0\7\7"+ - "\1\51\1\367\4\7\1\u0102\2\7\2\340\11\7\1\340"+ - "\13\7\1\0\6\7\12\0\7\7\1\51\25\7\1\337"+ - "\11\7\1\0\6\7\12\0\7\7\1\51\1\7\1\u0156"+ - "\35\7\1\0\6\7\12\0\7\7\1\51\17\7\1\u0157"+ - "\17\7\1\0\6\7\12\0\7\7\1\51\3\7\1\u0158"+ - "\33\7\1\0\6\7\12\0\7\7\1\51\1\u0102\36\7"+ - "\1\0\6\7\12\0\7\7\1\51\22\7\1\122\14\7"+ - "\1\0\6\7\12\0\6\7\1\u0159\1\51\1\7\1\u0117"+ - "\1\7\1\u015a\1\340\3\7\2\340\11\7\1\340\13\7"+ - "\1\0\6\7\12\0\7\7\1\51\24\7\1\u015b\12\7"+ - "\1\0\6\7\12\0\7\7\1\51\36\7\1\u015c\1\0"+ - "\6\7\12\0\7\7\1\51\22\7\1\u015d\14\7\1\0"+ - "\6\7\12\0\7\7\1\51\1\7\1\u015e\1\7\1\u015f"+ - "\13\7\1\u0160\17\7\1\0\6\7\12\0\7\7\1\51"+ - "\13\7\1\u0161\23\7\1\0\6\7\12\0\7\7\1\51"+ - "\3\7\1\356\33\7\1\0\6\7\12\0\7\7\1\51"+ - "\4\7\1\340\3\7\2\340\11\7\1\340\13\7\1\0"+ - "\6\7\12\0\7\7\1\51\1\340\36\7\1\0\6\7"+ - "\12\0\7\7\1\51\1\7\1\u0162\35\7\1\0\6\7"+ - "\12\0\7\7\1\51\1\7\1\u0117\1\7\1\u0117\1\340"+ - "\3\7\2\340\11\7\1\340\13\7\1\0\6\7\12\0"+ - "\6\7\1\u0163\1\51\37\7\1\0\6\7\12\0\7\7"+ - "\1\51\2\7\1\u0164\11\7\1\u0165\22\7\1\0\6\7"+ - "\12\0\7\7\1\51\1\7\1\175\1\202\4\7\1\177"+ - "\1\200\2\7\1\201\1\7\1\202\3\7\1\117\3\7"+ - "\1\177\1\7\1\203\7\7\1\0\6\7\12\0\7\7"+ - "\1\51\17\7\1\377\17\7\1\0\6\7\12\0\7\7"+ - "\1\51\1\u0166\36\7\1\0\6\7\12\0\7\7\1\51"+ - "\10\7\2\340\11\7\1\340\13\7\1\0\6\7\12\0"+ - "\7\7\1\51\5\7\1\u0167\31\7\1\0\6\7\12\0"+ - "\7\7\1\51\13\7\1\u0168\23\7\1\0\6\7\12\0"+ - "\7\7\1\51\3\7\1\275\33\7\1\0\6\7\12\0"+ - "\7\7\1\51\1\7\1\u0117\2\7\1\340\3\7\2\340"+ - "\1\7\1\u0166\7\7\1\340\13\7\1\0\6\7\12\0"+ - "\7\7\1\51\10\7\1\340\26\7\1\0\6\7\12\0"+ - "\7\7\1\51\6\7\1\u0169\12\7\1\u016a\1\u0111\5\7"+ - "\1\u016b\6\7\1\0\6\7\12\0\7\7\1\51\15\7"+ - "\1\u016c\21\7\1\0\6\7\12\0\7\7\1\51\1\7"+ - "\1\u0117\1\7\1\u0117\33\7\1\0\6\7\12\0\7\7"+ - "\1\51\30\7\1\u016d\6\7\1\0\6\7\12\0\7\7"+ - "\1\51\3\7\1\u015a\1\u016e\1\u0166\1\7\1\u016f\1\u0170"+ - "\1\u0171\1\7\1\u0172\1\7\1\u0173\1\u0166\4\7\1\u0174"+ - "\1\7\1\u0175\11\7\1\0\6\7\12\0\7\7\1\51"+ - "\10\7\2\340\25\7\1\0\6\7\12\0\7\7\1\51"+ - "\30\7\1\340\6\7\1\0\6\7\12\0\7\7\1\51"+ - "\27\7\1\340\7\7\1\0\6\7\12\0\7\7\1\51"+ - "\1\7\1\u0176\35\7\1\0\6\7\12\0\7\7\1\51"+ - "\10\7\2\340\11\7\1\340\1\u0177\12\7\1\0\6\7"+ - "\12\0\7\7\1\51\13\7\1\u0178\23\7\1\0\6\7"+ - "\12\0\7\7\1\51\1\7\1\u0179\35\7\1\0\6\7"+ - "\12\0\7\7\1\51\3\7\1\304\33\7\1\0\6\7"+ - "\12\0\7\7\1\51\26\7\1\367\10\7\1\0\6\7"+ - "\12\0\7\7\1\51\14\7\1\u017a\22\7\1\0\6\7"+ - "\12\0\7\7\1\51\14\7\1\u017b\2\7\1\u017c\17\7"+ - "\1\0\6\7\12\0\7\7\1\51\1\7\1\u017d\35\7"+ - "\1\0\6\7\12\0\7\7\1\51\6\7\1\u017e\30\7"+ - "\1\0\6\7\12\0\7\7\1\51\1\7\1\260\1\7"+ - "\1\260\33\7\1\0\6\7\12\0\7\7\1\51\14\7"+ - "\1\u017f\22\7\1\0\6\7\12\0\7\7\1\51\7\7"+ - "\1\u0144\27\7\1\0\6\7\12\0\7\7\1\51\3\7"+ - "\1\u0144\33\7\1\0\6\7\12\0\7\7\1\51\5\7"+ - "\1\u0180\31\7\1\0\6\7\12\0\7\7\1\51\13\7"+ - "\1\u0181\23\7\1\0\6\7\12\0\7\7\1\51\13\7"+ - "\1\340\23\7\1\0\6\7\12\0\7\7\1\51\1\367"+ - "\36\7\1\0\6\7\12\0\7\7\1\51\3\7\1\340"+ - "\2\7\1\340\30\7\1\0\6\7\12\0\7\7\1\51"+ - "\3\7\1\u0120\1\340\3\7\2\340\25\7\1\0\6\7"+ - "\12\0\7\7\1\51\2\7\1\u0182\34\7\1\0\6\7"+ - "\12\0\7\7\1\51\4\7\1\u0183\32\7\1\0\6\7"+ - "\12\0\7\7\1\51\17\7\1\u0184\17\7\1\0\6\7"+ - "\12\0\7\7\1\51\17\7\1\356\17\7\1\0\6\7"+ - "\12\0\7\7\1\51\21\7\1\304\15\7\1\0\6\7"+ - "\12\0\7\7\1\51\24\7\1\356\12\7\1\0\6\7"+ - "\12\0\7\7\1\51\10\7\1\u0185\26\7\1\0\6\7"+ - "\12\0\7\7\1\51\4\7\1\340\3\7\2\340\25\7"+ - "\1\0\6\7\12\0\7\7\1\51\6\7\1\340\1\7"+ - "\1\u0186\26\7\1\0\6\7\12\0\7\7\1\51\17\7"+ - "\1\367\17\7\1\0\6\7\12\0\7\7\1\51\7\7"+ - "\1\u0187\27\7\1\0\6\7\12\0\7\7\1\51\14\7"+ - "\1\u0188\22\7\1\0\6\7\12\0\7\7\1\51\15\7"+ - "\1\333\21\7\1\0\6\7\12\0\7\7\1\51\11\7"+ - "\1\340\2\7\1\340\22\7\1\0\6\7\12\0\7\7"+ - "\1\51\14\7\1\u0189\22\7\1\0\6\7\64\0\1\u018a"+ - "\15\0\7\7\1\51\22\7\1\u0131\14\7\1\0\6\7"+ - "\12\0\7\7\1\51\16\7\1\u018b\20\7\1\0\6\7"+ - "\12\0\7\7\1\51\21\7\1\u018c\15\7\1\0\6\7"+ - "\12\0\7\7\1\51\24\7\1\u018d\12\7\1\0\6\7"+ - "\12\0\7\7\1\51\17\7\1\u018e\17\7\1\0\6\7"+ - "\12\0\7\7\1\51\5\7\1\u018f\31\7\1\0\6\7"+ - "\12\0\7\7\1\51\7\7\1\u0190\27\7\1\0\6\7"+ - "\12\0\7\7\1\51\24\7\1\u0191\12\7\1\0\6\7"+ - "\12\0\6\7\1\340\1\51\37\7\1\0\6\7\12\0"+ - "\7\7\1\51\1\u0192\3\7\1\u0192\1\7\1\u0193\1\7"+ - "\2\u0192\10\7\1\u0192\14\7\1\0\6\7\12\0\7\7"+ - "\1\51\10\7\1\201\26\7\1\0\6\7\12\0\7\7"+ - "\1\51\1\340\5\7\1\u0192\1\7\2\340\2\7\1\u013a"+ - "\22\7\1\0\6\7\12\0\7\7\1\51\11\7\1\340"+ - "\25\7\1\0\6\7\12\0\7\7\1\51\13\7\1\u0194"+ - "\23\7\1\0\6\7\12\0\7\7\1\51\2\7\1\u0195"+ - "\34\7\1\0\6\7\12\0\7\7\1\51\1\340\5\7"+ - "\1\u0192\1\7\2\340\25\7\1\0\6\7\12\0\7\7"+ - "\1\51\3\7\1\u0196\33\7\1\0\6\7\12\0\6\7"+ - "\1\u0192\1\51\1\u0192\3\7\1\u0192\1\7\1\u0192\1\7"+ - "\2\u0192\12\7\1\u0192\12\7\1\0\6\7\12\0\7\7"+ - "\1\51\13\7\1\u0197\13\7\1\u0197\1\7\1\203\5\7"+ - "\1\0\6\7\12\0\7\7\1\51\22\7\1\u0198\14\7"+ - "\1\0\6\7\12\0\7\7\1\51\7\7\1\u0199\27\7"+ - "\1\0\6\7\12\0\6\7\1\u019a\1\51\37\7\1\0"+ - "\6\7\12\0\7\7\1\51\32\7\1\340\4\7\1\0"+ - "\6\7\12\0\7\7\1\51\1\7\1\u019b\35\7\1\0"+ - "\6\7\12\0\7\7\1\51\4\7\1\u019c\32\7\1\0"+ - "\6\7\12\0\7\7\1\51\2\7\1\340\34\7\1\0"+ - "\6\7\12\0\7\7\1\51\2\7\1\u0144\34\7\1\0"+ - "\6\7\12\0\7\7\1\51\1\7\1\u019d\35\7\1\0"+ - "\6\7\12\0\7\7\1\51\23\7\1\u019e\13\7\1\0"+ - "\6\7\12\0\7\7\1\51\21\7\1\u019f\5\7\1\u01a0"+ - "\7\7\1\0\6\7\12\0\7\7\1\51\16\7\1\u01a1"+ - "\20\7\1\0\6\7\12\0\7\7\1\51\4\7\1\u0137"+ - "\32\7\1\0\6\7\12\0\7\7\1\51\10\7\2\340"+ - "\3\7\1\340\5\7\1\340\13\7\1\0\6\7\12\0"+ - "\7\7\1\51\3\7\1\u0150\1\340\3\7\2\340\4\7"+ - "\1\u01a2\4\7\1\340\13\7\1\0\6\7\12\0\7\7"+ - "\1\51\1\u01a3\36\7\1\0\6\7\12\0\7\7\1\51"+ - "\3\7\1\u01a4\12\7\1\u01a5\20\7\1\0\6\7\12\0"+ - "\7\7\1\51\3\7\1\u0150\1\340\3\7\2\340\1\7"+ - "\1\340\2\7\1\u01a2\20\7\1\0\6\7\12\0\7\7"+ - "\1\51\4\7\1\340\4\7\1\340\25\7\1\0\6\7"+ - "\12\0\7\7\1\51\3\7\1\u0137\12\7\1\u01a6\20\7"+ - "\1\0\6\7\12\0\7\7\1\51\6\7\1\u01a7\30\7"+ - "\1\0\6\7\12\0\7\7\1\51\7\7\1\u01a8\27\7"+ - "\1\0\6\7\12\0\7\7\1\51\10\7\1\u0137\5\7"+ - "\1\u01a9\6\7\1\u01aa\11\7\1\0\6\7\12\0\7\7"+ - "\1\51\21\7\1\u01ab\15\7\1\0\6\7\12\0\7\7"+ - "\1\51\2\7\1\u01ac\34\7\1\0\6\7\12\0\7\7"+ - "\1\51\14\7\1\u0137\22\7\1\0\6\7\12\0\7\7"+ - "\1\51\14\7\1\u01ad\22\7\1\0\6\7\12\0\7\7"+ - "\1\51\2\7\1\u01ae\34\7\1\0\6\7\12\0\7\7"+ - "\1\51\3\7\2\340\1\7\1\340\1\7\2\340\11\7"+ - "\1\340\13\7\1\0\6\7\12\0\7\7\1\51\10\7"+ - "\2\364\11\7\1\364\13\7\1\0\6\7\12\0\7\7"+ - "\1\51\31\7\1\u01af\5\7\1\0\6\7\12\0\7\7"+ - "\1\51\3\7\1\u0117\33\7\1\0\6\7\12\0\7\7"+ - "\1\51\3\7\1\u01b0\2\7\1\u01b1\1\7\1\u01b2\26\7"+ - "\1\0\6\7\12\0\7\7\1\51\3\7\1\u01b3\2\7"+ - "\1\u01b4\1\7\1\u01b5\12\7\1\u01b5\13\7\1\0\6\7"+ - "\12\0\7\7\1\51\1\7\1\u01b6\1\7\1\u01b7\33\7"+ - "\1\0\6\7\12\0\7\7\1\51\2\7\1\201\34\7"+ - "\1\0\6\7\12\0\7\7\1\51\27\7\1\260\7\7"+ - "\1\0\6\7\12\0\7\7\1\51\2\7\1\u0109\34\7"+ - "\1\0\6\7\12\0\7\7\1\51\5\7\1\u01b8\31\7"+ - "\1\0\6\7\12\0\7\7\1\51\21\7\1\233\15\7"+ - "\1\0\6\7\12\0\7\7\1\51\1\7\1\u0117\35\7"+ - "\1\0\6\7\12\0\7\7\1\51\1\7\1\u01b9\35\7"+ - "\1\0\6\7\12\0\7\7\1\51\6\7\1\u0102\30\7"+ - "\1\0\6\7\12\0\7\7\1\51\21\7\1\u01ba\15\7"+ - "\1\0\6\7\12\0\7\7\1\51\13\7\1\u01ba\23\7"+ - "\1\0\6\7\12\0\7\7\1\51\21\7\1\u01bb\15\7"+ - "\1\0\6\7\12\0\7\7\1\51\30\7\1\u01bc\6\7"+ - "\1\0\6\7\12\0\7\7\1\51\7\7\1\u01bd\27\7"+ - "\1\0\6\7\12\0\7\7\1\51\10\7\2\u01be\11\7"+ - "\1\u01be\13\7\1\0\6\7\12\0\7\7\1\51\3\7"+ - "\1\u01bf\33\7\1\0\6\7\12\0\7\7\1\51\1\7"+ - "\1\u0117\21\7\1\u01be\1\7\1\u01c0\11\7\1\0\6\7"+ - "\12\0\7\7\1\51\10\7\1\u01be\12\7\1\u01be\13\7"+ - "\1\0\6\7\12\0\7\7\1\51\17\7\1\u01c1\17\7"+ - "\1\0\6\7\12\0\7\7\1\51\16\7\1\340\20\7"+ - "\1\0\6\7\12\0\7\7\1\51\10\7\1\340\4\7"+ - "\1\u01c2\21\7\1\0\6\7\12\0\7\7\1\51\1\7"+ - "\1\u0117\4\7\1\u01c3\1\7\1\u01c0\26\7\1\0\6\7"+ - "\12\0\7\7\1\51\13\7\1\201\5\7\1\117\15\7"+ - "\1\0\6\7\12\0\7\7\1\51\21\7\1\367\15\7"+ - "\1\0\6\7\12\0\7\7\1\51\24\7\1\122\12\7"+ - "\1\0\6\7\12\0\7\7\1\51\1\7\1\u01c4\35\7"+ - "\1\0\6\7\12\0\7\7\1\51\5\7\1\u01c5\31\7"+ - "\1\0\6\7\12\0\7\7\1\51\15\7\1\u01c6\21\7"+ - "\1\0\6\7\12\0\7\7\1\51\14\7\1\u01bc\22\7"+ - "\1\0\6\7\12\0\7\7\1\51\10\7\1\u01c7\26\7"+ - "\1\0\6\7\12\0\7\7\1\51\2\7\1\u01c8\34\7"+ - "\1\0\6\7\12\0\7\7\1\51\17\7\1\u010f\17\7"+ - "\1\0\6\7\12\0\7\7\1\51\17\7\1\u01c9\17\7"+ - "\1\0\6\7\12\0\7\7\1\51\6\7\1\377\30\7"+ - "\1\0\6\7\12\0\7\7\1\51\30\7\1\u01ca\6\7"+ - "\1\0\6\7\12\0\7\7\1\51\3\7\1\u01cb\33\7"+ - "\1\0\6\7\12\0\7\7\1\51\4\7\1\340\3\7"+ - "\2\340\11\7\1\340\12\7\1\117\1\0\6\7\12\0"+ - "\7\7\1\51\1\7\1\u0104\35\7\1\0\6\7\12\0"+ - "\7\7\1\51\1\7\1\u01cc\35\7\1\0\6\7\12\0"+ - "\7\7\1\51\15\7\1\u01cd\21\7\1\0\6\7\12\0"+ - "\7\7\1\51\15\7\1\u01ce\21\7\1\0\6\7\65\0"+ - "\1\u01cf\14\0\7\7\1\51\22\7\1\u01d0\14\7\1\0"+ - "\6\7\12\0\7\7\1\51\5\7\1\330\31\7\1\0"+ - "\6\7\12\0\7\7\1\51\21\7\1\u01d1\15\7\1\0"+ - "\6\7\12\0\7\7\1\51\15\7\1\u01d2\21\7\1\0"+ - "\6\7\12\0\7\7\1\51\2\7\1\233\34\7\1\0"+ - "\6\7\12\0\7\7\1\51\2\7\1\202\5\7\1\260"+ - "\2\7\1\u01d3\2\7\1\u0131\2\7\1\117\3\7\1\177"+ - "\11\7\1\0\6\7\12\0\7\7\1\51\1\7\1\u0192"+ - "\35\7\1\0\6\7\12\0\7\7\1\51\24\7\1\340"+ - "\12\7\1\0\6\7\12\0\7\7\1\51\15\7\1\260"+ - "\21\7\1\0\6\7\12\0\7\7\1\51\17\7\1\275"+ - "\17\7\1\0\6\7\12\0\7\7\1\51\31\7\1\340"+ - "\5\7\1\0\6\7\12\0\7\7\1\51\13\7\1\233"+ - "\23\7\1\0\6\7\12\0\7\7\1\51\1\7\1\u0192"+ - "\20\7\1\u0192\14\7\1\0\6\7\12\0\7\7\1\51"+ - "\1\7\1\u0141\35\7\1\0\6\7\12\0\7\7\1\51"+ - "\21\7\1\117\5\7\1\203\7\7\1\0\6\7\12\0"+ - "\7\7\1\51\22\7\1\u01d4\14\7\1\0\6\7\12\0"+ - "\7\7\1\51\14\7\1\233\5\7\1\u01d5\14\7\1\0"+ - "\6\7\12\0\7\7\1\51\23\7\1\u0120\13\7\1\0"+ - "\6\7\12\0\7\7\1\51\17\7\1\u0120\17\7\1\0"+ - "\6\7\12\0\7\7\1\51\10\7\1\u01d6\26\7\1\0"+ - "\6\7\12\0\7\7\1\51\3\7\1\u0150\33\7\1\0"+ - "\6\7\12\0\7\7\1\51\4\7\1\340\1\7\1\340"+ - "\1\7\1\u01d7\1\340\13\7\1\u0137\11\7\1\0\6\7"+ - "\12\0\7\7\1\51\3\7\1\u01d8\33\7\1\0\6\7"+ - "\12\0\7\7\1\51\3\7\1\u01d9\33\7\1\0\6\7"+ - "\12\0\7\7\1\51\4\7\1\340\32\7\1\0\6\7"+ - "\12\0\7\7\1\51\11\7\1\374\25\7\1\0\6\7"+ - "\12\0\7\7\1\51\3\7\1\u01da\33\7\1\0\6\7"+ - "\12\0\7\7\1\51\10\7\1\117\26\7\1\0\6\7"+ - "\12\0\7\7\1\51\11\7\1\340\2\7\1\u0137\1\7"+ - "\1\u0137\20\7\1\0\6\7\12\0\7\7\1\51\17\7"+ - "\1\u01db\17\7\1\0\6\7\12\0\7\7\1\51\30\7"+ - "\1\u01dc\6\7\1\0\6\7\12\0\7\7\1\51\6\7"+ - "\1\340\2\7\1\340\11\7\1\340\13\7\1\0\6\7"+ - "\12\0\7\7\1\51\25\7\1\u01dd\11\7\1\0\6\7"+ - "\12\0\7\7\1\51\4\7\1\340\16\7\1\340\13\7"+ - "\1\0\6\7\12\0\7\7\1\51\31\7\1\u01de\5\7"+ - "\1\0\6\7\12\0\7\7\1\51\31\7\1\u01df\5\7"+ - "\1\0\6\7\12\0\7\7\1\51\31\7\1\u0166\5\7"+ - "\1\0\6\7\12\0\7\7\1\51\31\7\1\u01e0\5\7"+ - "\1\0\6\7\12\0\7\7\1\51\31\7\1\u01e1\5\7"+ - "\1\0\6\7\12\0\7\7\1\51\31\7\1\u015d\5\7"+ - "\1\0\6\7\12\0\7\7\1\51\3\7\1\u01e2\2\7"+ - "\1\u01e2\30\7\1\0\6\7\12\0\7\7\1\51\3\7"+ - "\1\u01e3\2\7\1\u01e3\30\7\1\0\6\7\12\0\7\7"+ - "\1\51\10\7\1\374\26\7\1\0\6\7\12\0\7\7"+ - "\1\51\10\7\1\340\12\7\1\340\13\7\1\0\6\7"+ - "\12\0\7\7\1\51\2\7\1\u01e4\34\7\1\0\6\7"+ - "\12\0\7\7\1\51\20\7\1\u01e5\16\7\1\0\6\7"+ - "\12\0\7\7\1\51\15\7\1\u01e6\21\7\1\0\6\7"+ - "\12\0\7\7\1\51\3\7\1\u0133\22\7\1\u0133\10\7"+ - "\1\0\6\7\12\0\7\7\1\51\30\7\1\u0166\6\7"+ - "\1\0\6\7\12\0\7\7\1\51\1\7\1\260\35\7"+ - "\1\0\6\7\12\0\7\7\1\51\1\7\1\u0117\13\7"+ - "\1\340\4\7\1\u01b9\1\340\1\7\1\122\11\7\1\0"+ - "\6\7\12\0\7\7\1\51\26\7\1\u0133\10\7\1\0"+ - "\6\7\12\0\7\7\1\51\5\7\1\340\10\7\1\340"+ - "\20\7\1\0\6\7\12\0\7\7\1\51\21\7\1\u017c"+ - "\15\7\1\0\6\7\12\0\7\7\1\51\7\7\1\u01e7"+ - "\27\7\1\0\6\7\12\0\7\7\1\51\1\u01bc\36\7"+ - "\1\0\6\7\12\0\7\7\1\51\22\7\1\u01e8\14\7"+ - "\1\0\6\7\12\0\7\7\1\51\17\7\1\u01e9\17\7"+ - "\1\0\6\7\12\0\7\7\1\51\5\7\1\u01bc\31\7"+ - "\1\0\6\7\12\0\7\7\1\51\10\7\1\u0166\14\7"+ - "\1\u0166\11\7\1\0\6\7\12\0\7\7\1\51\3\7"+ - "\1\u01bc\33\7\1\0\6\7\12\0\7\7\1\51\21\7"+ - "\1\u01ea\15\7\1\0\6\7\12\0\7\7\1\51\5\7"+ - "\1\u01eb\31\7\1\0\6\7\12\0\7\7\1\51\16\7"+ - "\1\u01ec\20\7\1\0\6\7\66\0\1\u01ed\13\0\7\7"+ - "\1\51\14\7\1\201\22\7\1\0\6\7\12\0\7\7"+ - "\1\51\34\7\1\u01ee\2\7\1\0\6\7\12\0\7\7"+ - "\1\51\14\7\1\u01d1\22\7\1\0\6\7\12\0\7\7"+ - "\1\51\16\7\1\340\2\7\1\340\15\7\1\0\6\7"+ - "\12\0\7\7\1\51\17\7\1\u0141\11\7\1\233\5\7"+ - "\1\0\6\7\12\0\7\7\1\51\17\7\1\u0141\17\7"+ - "\1\0\6\7\12\0\7\7\1\51\23\7\1\u01ef\13\7"+ - "\1\0\6\7\12\0\7\7\1\51\10\7\1\u0137\1\u01a6"+ - "\25\7\1\0\6\7\12\0\7\7\1\51\11\7\1\u01a6"+ - "\25\7\1\0\6\7\12\0\7\7\1\51\30\7\1\u01a6"+ - "\6\7\1\0\6\7\12\0\7\7\1\51\2\7\1\u01f0"+ - "\34\7\1\0\6\7\12\0\7\7\1\51\10\7\1\u01f1"+ - "\14\7\1\u01f1\11\7\1\0\6\7\12\0\7\7\1\51"+ - "\27\7\1\u01f2\7\7\1\0\6\7\12\0\7\7\1\51"+ - "\1\7\1\u01f3\35\7\1\0\6\7\12\0\7\7\1\51"+ - "\1\7\1\u01f4\35\7\1\0\6\7\12\0\7\7\1\51"+ - "\3\7\1\u01f5\33\7\1\0\6\7\12\0\7\7\1\51"+ - "\3\7\1\u01f6\33\7\1\0\6\7\12\0\7\7\1\51"+ - "\31\7\1\152\5\7\1\0\6\7\12\0\7\7\1\51"+ - "\31\7\1\u01f7\5\7\1\0\6\7\12\0\7\7\1\51"+ - "\10\7\1\u01f8\26\7\1\0\6\7\12\0\7\7\1\51"+ - "\27\7\1\u01f9\7\7\1\0\6\7\12\0\7\7\1\51"+ - "\24\7\1\u01fa\12\7\1\0\6\7\12\0\7\7\1\51"+ - "\21\7\1\u01bc\15\7\1\0\6\7\12\0\7\7\1\51"+ - "\17\7\1\u01bc\17\7\1\0\6\7\12\0\6\7\1\u01e8"+ - "\1\51\37\7\1\0\6\7\12\0\7\7\1\51\23\7"+ - "\1\u01a6\13\7\1\0\6\7\12\0\7\7\1\51\6\7"+ - "\1\u01fb\30\7\1\0\6\7\12\0\7\7\1\51\1\7"+ - "\1\u01fc\35\7\1\0\6\7\67\0\1\u01fd\12\0\7\7"+ - "\1\51\35\7\1\340\1\7\1\0\6\7\12\0\7\7"+ - "\1\51\6\7\1\117\30\7\1\0\6\7\12\0\7\7"+ - "\1\51\25\7\1\u01fe\11\7\1\0\6\7\12\0\7\7"+ - "\1\51\4\7\1\u0137\3\7\1\117\1\374\11\7\1\u01ef"+ - "\13\7\1\0\6\7\12\0\7\7\1\51\4\7\1\340"+ - "\3\7\2\340\11\7\1\340\7\7\1\u01a6\3\7\1\0"+ - "\6\7\12\0\7\7\1\51\6\7\1\340\1\7\1\340"+ - "\26\7\1\0\6\7\12\0\7\7\1\51\3\7\1\340"+ - "\4\7\1\340\26\7\1\0\6\7\12\0\7\7\1\51"+ - "\6\7\1\340\1\7\1\340\12\7\1\340\13\7\1\0"+ - "\6\7\12\0\7\7\1\51\3\7\1\340\4\7\1\340"+ - "\12\7\1\340\13\7\1\0\6\7\12\0\7\7\1\51"+ - "\3\7\1\u01b9\33\7\1\0\6\7\12\0\7\7\1\51"+ - "\5\7\1\77\31\7\1\0\6\7\12\0\7\7\1\51"+ - "\21\7\1\u01ff\15\7\1\0\6\7\12\0\7\7\1\51"+ - "\15\7\1\u0200\5\7\1\340\13\7\1\0\6\7\12\0"+ - "\7\7\1\51\2\7\1\u0201\34\7\1\0\6\7\12\0"+ - "\7\7\1\51\1\7\1\u011d\35\7\1\0\6\7\12\0"+ - "\7\7\1\51\13\7\1\u0202\3\7\1\u0203\17\7\1\0"+ - "\6\7\12\0\7\7\1\51\13\7\1\u0204\23\7\1\0"+ - "\6\7\12\0\7\7\1\51\5\7\1\u0205\31\7\1\0"+ - "\6\7\12\0\7\7\1\51\17\7\1\u0206\17\7\1\0"+ - "\6\7\12\0\4\7\1\340\2\7\1\51\31\7\2\340"+ - "\4\7\1\0\6\7\12\0\7\7\1\51\5\7\1\u0207"+ - "\31\7\1\0\6\7\12\0\7\7\1\51\3\7\1\u0208"+ - "\33\7\1\0\6\7\12\0\7\7\1\51\5\7\1\340"+ - "\31\7\1\0\6\7\12\0\7\7\1\51\3\7\1\u0209"+ - "\33\7\1\0\6\7\12\0\7\7\1\51\17\7\1\u01a6"+ - "\17\7\1\0\6\7\12\0\7\7\1\51\3\7\1\u020a"+ - "\33\7\1\0\6\7\12\0\7\7\1\51\22\7\1\77"+ - "\14\7\1\0\6\7\4\0"; - - private static int [] zzUnpackTrans() { - int [] result = new int[28000]; - int offset = 0; - offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackTrans(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - value--; - do result[j++] = value; while (--count > 0); - } - return j; - } - - - /* error codes */ - private static final int ZZ_UNKNOWN_ERROR = 0; - private static final int ZZ_NO_MATCH = 1; - private static final int ZZ_PUSHBACK_2BIG = 2; - private static final char[] EMPTY_BUFFER = new char[0]; - private static final int YYEOF = -1; - private static Reader zzReader; // Fake - - /* error messages for the codes above */ - private static final String ZZ_ERROR_MSG[] = { - "Unkown internal scanner error", - "Error: could not match input", - "Error: pushback value was too large" - }; - - /** - * ZZ_ATTRIBUTE[aState] contains the attributes of state aState - */ - private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); - - private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\1\0\1\11\1\1\1\11\6\1\1\11\26\1\4\11"+ - "\1\1\1\0\2\11\1\0\161\1\1\0\214\1\1\0"+ - "\140\1\1\0\104\1\1\0\35\1\1\0\17\1\1\11"+ - "\15\1"; - - private static int [] zzUnpackAttribute() { - int [] result = new int[522]; - int offset = 0; - offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackAttribute(String packed, int offset, int [] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; - } - - /** the current state of the DFA */ - private int zzState; - - /** the current lexical state */ - private int zzLexicalState = YYINITIAL; - - /** this buffer contains the current text to be matched and is - the source of the yytext() string */ - private CharSequence zzBuffer = ""; - - /** this buffer may contains the current text array to be matched when it is cheap to acquire it */ - private char[] zzBufferArray; - - /** the textposition at the last accepting state */ - private int zzMarkedPos; - - /** the textposition at the last state to be included in yytext */ - private int zzPushbackPos; - - /** the current text position in the buffer */ - private int zzCurrentPos; - - /** startRead marks the beginning of the yytext() string in the buffer */ - private int zzStartRead; - - /** endRead marks the last character in the buffer, that has been read - from input */ - private int zzEndRead; - - /** - * zzAtBOL == true <=> the scanner is currently at the beginning of a line - */ - private boolean zzAtBOL = true; - - /** zzAtEOF == true <=> the scanner is at the EOF */ - private boolean zzAtEOF; - - /* user code: */ - public _AsmIntelLexer() { - this(null); - } - - - /** - * Creates a new scanner - * - * @param in the java.io.Reader to read input from. - */ - public _AsmIntelLexer(Reader in) { - zzReader = in; - } - - - /** - * Unpacks the compressed character translation table. - * - * @param packed the packed character translation table - * @return the unpacked character translation table - */ - private static char [] zzUnpackCMap(String packed) { - char [] map = new char[0x10000]; - int i = 0; /* index in packed string */ - int j = 0; /* index in unpacked array */ - while (i < 1734) { - int count = packed.charAt(i++); - char value = packed.charAt(i++); - do map[j++] = value; while (--count > 0); - } - return map; - } - - @Override - public final int getTokenStart(){ - return zzStartRead; - } - - @Override - public final int getTokenEnd(){ - return getTokenStart() + yylength(); - } - - @Override - public void reset(CharSequence buffer, int start, int end, int initialState){ - zzBuffer = buffer; - zzBufferArray = CharArrayUtil.fromSequenceWithoutCopying(buffer); - zzCurrentPos = zzMarkedPos = zzStartRead = start; - zzPushbackPos = 0; - zzAtEOF = false; - zzAtBOL = true; - zzEndRead = end; - yybegin(initialState); - } - - /** - * Refills the input buffer. - * - * @return false, iff there was new input. - * - * @exception IOException if any I/O-Error occurs - */ - private boolean zzRefill() throws IOException { - return true; - } - - - /** - * Returns the current lexical state. - */ - @Override - public final int yystate() { - return zzLexicalState; - } - - - /** - * Enters a new lexical state - * - * @param newState the new lexical state - */ - @Override - public final void yybegin(int newState) { - zzLexicalState = newState; - } - - - /** - * Returns the text matched by the current regular expression. - */ - public final CharSequence yytext() { - return zzBuffer.subSequence(zzStartRead, zzMarkedPos); - } - - - /** - * Returns the character at position pos from the - * matched text. - * - * It is equivalent to yytext().charAt(pos), but faster - * - * @param pos the position of the character to fetch. - * A value from 0 to yylength()-1. - * - * @return the character at position pos - */ - public final char yycharat(int pos) { - return zzBufferArray != null ? zzBufferArray[zzStartRead+pos]:zzBuffer.charAt(zzStartRead+pos); - } - - - /** - * Returns the length of the matched text region. - */ - public final int yylength() { - return zzMarkedPos-zzStartRead; - } - - - /** - * Reports an error that occured while scanning. - * - * In a wellformed scanner (no or only correct usage of - * yypushback(int) and a match-all fallback rule) this method - * will only be called with things that "Can't Possibly Happen". - * If this method is called, something is seriously wrong - * (e.g. a JFlex bug producing a faulty scanner etc.). - * - * Usual syntax/scanner level error handling should be done - * in error fallback rules. - * - * @param errorCode the code of the errormessage to display - */ - private void zzScanError(int errorCode) { - String message; - try { - message = ZZ_ERROR_MSG[errorCode]; - } - catch (ArrayIndexOutOfBoundsException e) { - message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; - } - - throw new Error(message); - } - - - /** - * Pushes the specified amount of characters back into the input stream. - * - * They will be read again by then next call of the scanning method - * - * @param number the number of characters to be read again. - * This number must not be greater than yylength()! - */ - public void yypushback(int number) { - if ( number > yylength() ) - zzScanError(ZZ_PUSHBACK_2BIG); - - zzMarkedPos -= number; - } - - - /** - * Resumes scanning until the next regular expression is matched, - * the end of input is encountered or an I/O-Error occurs. - * - * @return the next token - * @exception IOException if any I/O-Error occurs - */ - @Override - public IElementType advance() throws IOException { - int zzInput; - int zzAction; - - // cached fields: - int zzCurrentPosL; - int zzMarkedPosL; - int zzEndReadL = zzEndRead; - CharSequence zzBufferL = zzBuffer; - char[] zzBufferArrayL = zzBufferArray; - char [] zzCMapL = ZZ_CMAP; - - int [] zzTransL = ZZ_TRANS; - int [] zzRowMapL = ZZ_ROWMAP; - int [] zzAttrL = ZZ_ATTRIBUTE; - - while (true) { - zzMarkedPosL = zzMarkedPos; - - zzAction = -1; - - zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; - - zzState = ZZ_LEXSTATE[zzLexicalState]; - - - zzForAction: { - while (true) { - - if (zzCurrentPosL < zzEndReadL) - zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++); - else if (zzAtEOF) { - zzInput = YYEOF; - break zzForAction; - } - else { - // store back cached positions - zzCurrentPos = zzCurrentPosL; - zzMarkedPos = zzMarkedPosL; - boolean eof = zzRefill(); - // get translated positions and possibly new buffer - zzCurrentPosL = zzCurrentPos; - zzMarkedPosL = zzMarkedPos; - zzBufferL = zzBuffer; - zzEndReadL = zzEndRead; - if (eof) { - zzInput = YYEOF; - break zzForAction; - } - else { - zzInput = zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++); - } - } - int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; - if (zzNext == -1) break zzForAction; - zzState = zzNext; - - int zzAttributes = zzAttrL[zzState]; - if ( (zzAttributes & 1) == 1 ) { - zzAction = zzState; - zzMarkedPosL = zzCurrentPosL; - if ( (zzAttributes & 8) == 8 ) break zzForAction; - } - - } - } - - // store back cached position - zzMarkedPos = zzMarkedPosL; - - switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { - case 17: - return FLAG; - case 19: break; - case 8: - return COMMA; - case 20: break; - case 4: - return INT; - case 21: break; - case 10: - return LINE_COMMENT; - case 22: break; - case 3: - return IDENTIFIER; - case 23: break; - case 12: - return LABEL; - case 24: break; - case 1: - return TokenType.BAD_CHARACTER; - case 25: break; - case 14: - return HEX; - case 26: break; - case 2: - return TokenType.WHITE_SPACE; - case 27: break; - case 5: - return COLON; - case 28: break; - case 6: - return LPAREN; - case 29: break; - case 7: - return RPAREN; - case 30: break; - case 16: - return TEXT; - case 31: break; - case 11: - return STRING; - case 32: break; - case 9: - return BIT_OR; - case 33: break; - case 18: - return IMPORT; - case 34: break; - case 15: - return INSTRUCTION; - case 35: break; - case 13: - return PSEUDO_REG; - case 36: break; - default: - if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { - zzAtEOF = true; - return null; - } - else { - zzScanError(ZZ_NO_MATCH); - } - } - } - } - - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/parser/AsmIntelParser.java b/plan9/gen/com/plan9/intel/lang/core/parser/AsmIntelParser.java deleted file mode 100644 index 2e457ff45d..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/parser/AsmIntelParser.java +++ /dev/null @@ -1,292 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.parser; - -import com.intellij.lang.PsiBuilder; -import com.intellij.lang.PsiBuilder.Marker; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import static com.intellij.lang.parser.GeneratedParserUtilBase.*; -import com.intellij.psi.tree.IElementType; -import com.intellij.lang.ASTNode; -import com.intellij.psi.tree.TokenSet; -import com.intellij.lang.PsiParser; -import com.intellij.lang.LightPsiParser; - -@SuppressWarnings({"SimplifiableIfStatement", "UnusedAssignment"}) -public class AsmIntelParser implements PsiParser, LightPsiParser { - - public ASTNode parse(IElementType t, PsiBuilder b) { - parseLight(t, b); - return b.getTreeBuilt(); - } - - public void parseLight(IElementType t, PsiBuilder b) { - boolean r; - b = adapt_builder_(t, b, this, null); - Marker m = enter_section_(b, 0, _COLLAPSE_, null); - if (t == FRAME_SIZE) { - r = FrameSize(b, 0); - } - else if (t == FUNCTION) { - r = Function(b, 0); - } - else if (t == FUNCTION_BODY) { - r = FunctionBody(b, 0); - } - else if (t == FUNCTION_FLAGS) { - r = FunctionFlags(b, 0); - } - else if (t == FUNCTION_HEADER) { - r = FunctionHeader(b, 0); - } - else if (t == INSTRUCTION_STMT) { - r = InstructionStmt(b, 0); - } - else if (t == LITERAL) { - r = Literal(b, 0); - } - else if (t == OPERANDS) { - r = Operands(b, 0); - } - else if (t == PREPROCESSOR_DIRECTIVE) { - r = PreprocessorDirective(b, 0); - } - else if (t == STATEMENT) { - r = Statement(b, 0); - } - else { - r = parse_root_(t, b, 0); - } - exit_section_(b, 0, m, t, r, true, TRUE_CONDITION); - } - - protected boolean parse_root_(IElementType t, PsiBuilder b, int l) { - return File(b, l + 1); - } - - /* ********************************************************** */ - // Statement* - static boolean File(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "File")) return false; - int c = current_position_(b); - while (true) { - if (!Statement(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "File", c)) break; - c = current_position_(b); - } - return true; - } - - /* ********************************************************** */ - // '$' Literal ['-' Literal] - public static boolean FrameSize(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FrameSize")) return false; - boolean r; - Marker m = enter_section_(b, l, _NONE_, FRAME_SIZE, ""); - r = consumeToken(b, "$"); - r = r && Literal(b, l + 1); - r = r && FrameSize_2(b, l + 1); - exit_section_(b, l, m, r, false, null); - return r; - } - - // ['-' Literal] - private static boolean FrameSize_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FrameSize_2")) return false; - FrameSize_2_0(b, l + 1); - return true; - } - - // '-' Literal - private static boolean FrameSize_2_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FrameSize_2_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, "-"); - r = r && Literal(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // FunctionHeader FunctionBody - public static boolean Function(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "Function")) return false; - if (!nextTokenIs(b, TEXT)) return false; - boolean r; - Marker m = enter_section_(b); - r = FunctionHeader(b, l + 1); - r = r && FunctionBody(b, l + 1); - exit_section_(b, m, FUNCTION, r); - return r; - } - - /* ********************************************************** */ - // ( InstructionStmt | LABEL )* - public static boolean FunctionBody(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FunctionBody")) return false; - Marker m = enter_section_(b, l, _NONE_, FUNCTION_BODY, ""); - int c = current_position_(b); - while (true) { - if (!FunctionBody_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "FunctionBody", c)) break; - c = current_position_(b); - } - exit_section_(b, l, m, true, false, null); - return true; - } - - // InstructionStmt | LABEL - private static boolean FunctionBody_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FunctionBody_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = InstructionStmt(b, l + 1); - if (!r) r = consumeToken(b, LABEL); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // FLAG | '(' FLAG ( '|' FLAG )* ')' - public static boolean FunctionFlags(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FunctionFlags")) return false; - if (!nextTokenIs(b, "", LPAREN, FLAG)) return false; - boolean r; - Marker m = enter_section_(b, l, _NONE_, FUNCTION_FLAGS, ""); - r = consumeToken(b, FLAG); - if (!r) r = FunctionFlags_1(b, l + 1); - exit_section_(b, l, m, r, false, null); - return r; - } - - // '(' FLAG ( '|' FLAG )* ')' - private static boolean FunctionFlags_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FunctionFlags_1")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, LPAREN); - r = r && consumeToken(b, FLAG); - r = r && FunctionFlags_1_2(b, l + 1); - r = r && consumeToken(b, RPAREN); - exit_section_(b, m, null, r); - return r; - } - - // ( '|' FLAG )* - private static boolean FunctionFlags_1_2(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FunctionFlags_1_2")) return false; - int c = current_position_(b); - while (true) { - if (!FunctionFlags_1_2_0(b, l + 1)) break; - if (!empty_element_parsed_guard_(b, "FunctionFlags_1_2", c)) break; - c = current_position_(b); - } - return true; - } - - // '|' FLAG - private static boolean FunctionFlags_1_2_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FunctionFlags_1_2_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, BIT_OR); - r = r && consumeToken(b, FLAG); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // TEXT identifier '(' PSEUDO_REG ')' ',' FunctionFlags [',' FrameSize] - public static boolean FunctionHeader(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FunctionHeader")) return false; - if (!nextTokenIs(b, TEXT)) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeTokens(b, 0, TEXT, IDENTIFIER); - r = r && consumeToken(b, LPAREN); - r = r && consumeToken(b, PSEUDO_REG); - r = r && consumeToken(b, RPAREN); - r = r && consumeToken(b, COMMA); - r = r && FunctionFlags(b, l + 1); - r = r && FunctionHeader_7(b, l + 1); - exit_section_(b, m, FUNCTION_HEADER, r); - return r; - } - - // [',' FrameSize] - private static boolean FunctionHeader_7(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FunctionHeader_7")) return false; - FunctionHeader_7_0(b, l + 1); - return true; - } - - // ',' FrameSize - private static boolean FunctionHeader_7_0(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "FunctionHeader_7_0")) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, COMMA); - r = r && FrameSize(b, l + 1); - exit_section_(b, m, null, r); - return r; - } - - /* ********************************************************** */ - // INSTRUCTION Operands - public static boolean InstructionStmt(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "InstructionStmt")) return false; - if (!nextTokenIs(b, INSTRUCTION)) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeToken(b, INSTRUCTION); - r = r && Operands(b, l + 1); - exit_section_(b, m, INSTRUCTION_STMT, r); - return r; - } - - /* ********************************************************** */ - // int | hex - public static boolean Literal(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "Literal")) return false; - if (!nextTokenIs(b, "", HEX, INT)) return false; - boolean r; - Marker m = enter_section_(b, l, _NONE_, LITERAL, ""); - r = consumeToken(b, INT); - if (!r) r = consumeToken(b, HEX); - exit_section_(b, l, m, r, false, null); - return r; - } - - /* ********************************************************** */ - public static boolean Operands(PsiBuilder b, int l) { - Marker m = enter_section_(b); - exit_section_(b, m, OPERANDS, true); - return true; - } - - /* ********************************************************** */ - // import STRING - public static boolean PreprocessorDirective(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "PreprocessorDirective")) return false; - if (!nextTokenIs(b, IMPORT)) return false; - boolean r; - Marker m = enter_section_(b); - r = consumeTokens(b, 0, IMPORT, STRING); - exit_section_(b, m, PREPROCESSOR_DIRECTIVE, r); - return r; - } - - /* ********************************************************** */ - // PreprocessorDirective | Function - public static boolean Statement(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "Statement")) return false; - if (!nextTokenIs(b, "", TEXT, IMPORT)) return false; - boolean r; - Marker m = enter_section_(b, l, _NONE_, STATEMENT, ""); - r = PreprocessorDirective(b, l + 1); - if (!r) r = Function(b, l + 1); - exit_section_(b, l, m, r, false, null); - return r; - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFrameSize.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFrameSize.java deleted file mode 100644 index a3d3c945e4..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFrameSize.java +++ /dev/null @@ -1,13 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelFrameSize extends PsiElement { - - @NotNull - List getLiteralList(); - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunction.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunction.java deleted file mode 100644 index c769683fd8..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunction.java +++ /dev/null @@ -1,16 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelFunction extends PsiElement { - - @NotNull - AsmIntelFunctionBody getFunctionBody(); - - @NotNull - AsmIntelFunctionHeader getFunctionHeader(); - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunctionBody.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunctionBody.java deleted file mode 100644 index fa0a33ce79..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunctionBody.java +++ /dev/null @@ -1,13 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelFunctionBody extends PsiElement { - - @NotNull - List getInstructionStmtList(); - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunctionFlags.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunctionFlags.java deleted file mode 100644 index 843f00bf28..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunctionFlags.java +++ /dev/null @@ -1,10 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelFunctionFlags extends PsiElement { - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunctionHeader.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunctionHeader.java deleted file mode 100644 index 268f03e634..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelFunctionHeader.java +++ /dev/null @@ -1,16 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelFunctionHeader extends PsiElement { - - @Nullable - AsmIntelFrameSize getFrameSize(); - - @NotNull - AsmIntelFunctionFlags getFunctionFlags(); - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelInstructionStmt.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelInstructionStmt.java deleted file mode 100644 index 092302e1c9..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelInstructionStmt.java +++ /dev/null @@ -1,13 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelInstructionStmt extends PsiElement { - - @NotNull - AsmIntelOperands getOperands(); - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelLiteral.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelLiteral.java deleted file mode 100644 index 9d71949b76..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelLiteral.java +++ /dev/null @@ -1,10 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelLiteral extends PsiElement { - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelOperands.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelOperands.java deleted file mode 100644 index 341f917dda..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelOperands.java +++ /dev/null @@ -1,10 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelOperands extends PsiElement { - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelPreprocessorDirective.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelPreprocessorDirective.java deleted file mode 100644 index 923d88c85a..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelPreprocessorDirective.java +++ /dev/null @@ -1,10 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelPreprocessorDirective extends PsiElement { - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelStatement.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelStatement.java deleted file mode 100644 index 55d016fa35..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelStatement.java +++ /dev/null @@ -1,16 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElement; - -public interface AsmIntelStatement extends PsiElement { - - @Nullable - AsmIntelFunction getFunction(); - - @Nullable - AsmIntelPreprocessorDirective getPreprocessorDirective(); - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelTypes.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelTypes.java deleted file mode 100644 index ecf56bbb43..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelTypes.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import com.intellij.psi.tree.IElementType; -import com.intellij.psi.PsiElement; -import com.intellij.lang.ASTNode; -import com.plan9.intel.lang.core.lexer.AsmIntelTokenType; -import com.plan9.intel.lang.core.psi.impl.*; - -public interface AsmIntelTypes { - - IElementType FRAME_SIZE = new AsmIntelElementType("FRAME_SIZE"); - IElementType FUNCTION = new AsmIntelElementType("FUNCTION"); - IElementType FUNCTION_BODY = new AsmIntelElementType("FUNCTION_BODY"); - IElementType FUNCTION_FLAGS = new AsmIntelElementType("FUNCTION_FLAGS"); - IElementType FUNCTION_HEADER = new AsmIntelElementType("FUNCTION_HEADER"); - IElementType INSTRUCTION_STMT = new AsmIntelElementType("INSTRUCTION_STMT"); - IElementType LITERAL = new AsmIntelElementType("LITERAL"); - IElementType OPERANDS = new AsmIntelElementType("OPERANDS"); - IElementType PREPROCESSOR_DIRECTIVE = new AsmIntelElementType("PREPROCESSOR_DIRECTIVE"); - IElementType STATEMENT = new AsmIntelElementType("STATEMENT"); - - IElementType BIT_OR = new AsmIntelTokenType("|"); - IElementType COLON = new AsmIntelTokenType(":"); - IElementType COMMA = new AsmIntelTokenType(","); - IElementType FLAG = new AsmIntelTokenType("FLAG"); - IElementType HEX = new AsmIntelTokenType("hex"); - IElementType IDENTIFIER = new AsmIntelTokenType("identifier"); - IElementType IMPORT = new AsmIntelTokenType("import"); - IElementType INSTRUCTION = new AsmIntelTokenType("INSTRUCTION"); - IElementType INT = new AsmIntelTokenType("int"); - IElementType LABEL = new AsmIntelTokenType("LABEL"); - IElementType LPAREN = new AsmIntelTokenType("("); - IElementType PSEUDO_REG = new AsmIntelTokenType("PSEUDO_REG"); - IElementType RPAREN = new AsmIntelTokenType(")"); - IElementType STRING = new AsmIntelTokenType("STRING"); - IElementType TEXT = new AsmIntelTokenType("TEXT"); - - class Factory { - public static PsiElement createElement(ASTNode node) { - IElementType type = node.getElementType(); - if (type == FRAME_SIZE) { - return new AsmIntelFrameSizeImpl(node); - } - else if (type == FUNCTION) { - return new AsmIntelFunctionImpl(node); - } - else if (type == FUNCTION_BODY) { - return new AsmIntelFunctionBodyImpl(node); - } - else if (type == FUNCTION_FLAGS) { - return new AsmIntelFunctionFlagsImpl(node); - } - else if (type == FUNCTION_HEADER) { - return new AsmIntelFunctionHeaderImpl(node); - } - else if (type == INSTRUCTION_STMT) { - return new AsmIntelInstructionStmtImpl(node); - } - else if (type == LITERAL) { - return new AsmIntelLiteralImpl(node); - } - else if (type == OPERANDS) { - return new AsmIntelOperandsImpl(node); - } - else if (type == PREPROCESSOR_DIRECTIVE) { - return new AsmIntelPreprocessorDirectiveImpl(node); - } - else if (type == STATEMENT) { - return new AsmIntelStatementImpl(node); - } - throw new AssertionError("Unknown element type: " + type); - } - } -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelVisitor.java b/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelVisitor.java deleted file mode 100644 index 1e1ab4196c..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/AsmIntelVisitor.java +++ /dev/null @@ -1,54 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi; - -import org.jetbrains.annotations.*; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.PsiElement; - -public class AsmIntelVisitor extends PsiElementVisitor { - - public void visitFrameSize(@NotNull AsmIntelFrameSize o) { - visitPsiElement(o); - } - - public void visitFunction(@NotNull AsmIntelFunction o) { - visitPsiElement(o); - } - - public void visitFunctionBody(@NotNull AsmIntelFunctionBody o) { - visitPsiElement(o); - } - - public void visitFunctionFlags(@NotNull AsmIntelFunctionFlags o) { - visitPsiElement(o); - } - - public void visitFunctionHeader(@NotNull AsmIntelFunctionHeader o) { - visitPsiElement(o); - } - - public void visitInstructionStmt(@NotNull AsmIntelInstructionStmt o) { - visitPsiElement(o); - } - - public void visitLiteral(@NotNull AsmIntelLiteral o) { - visitPsiElement(o); - } - - public void visitOperands(@NotNull AsmIntelOperands o) { - visitPsiElement(o); - } - - public void visitPreprocessorDirective(@NotNull AsmIntelPreprocessorDirective o) { - visitPsiElement(o); - } - - public void visitStatement(@NotNull AsmIntelStatement o) { - visitPsiElement(o); - } - - public void visitPsiElement(@NotNull PsiElement o) { - visitElement(o); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFrameSizeImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFrameSizeImpl.java deleted file mode 100644 index bf209a08ca..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFrameSizeImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelFrameSizeImpl extends AsmIntelElementImpl implements AsmIntelFrameSize { - - public AsmIntelFrameSizeImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitFrameSize(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - - @Override - @NotNull - public List getLiteralList() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, AsmIntelLiteral.class); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionBodyImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionBodyImpl.java deleted file mode 100644 index ce54f2f97c..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionBodyImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelFunctionBodyImpl extends AsmIntelElementImpl implements AsmIntelFunctionBody { - - public AsmIntelFunctionBodyImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitFunctionBody(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - - @Override - @NotNull - public List getInstructionStmtList() { - return PsiTreeUtil.getChildrenOfTypeAsList(this, AsmIntelInstructionStmt.class); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionFlagsImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionFlagsImpl.java deleted file mode 100644 index acce464b80..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionFlagsImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelFunctionFlagsImpl extends AsmIntelElementImpl implements AsmIntelFunctionFlags { - - public AsmIntelFunctionFlagsImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitFunctionFlags(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionHeaderImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionHeaderImpl.java deleted file mode 100644 index 6c0fc9e151..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionHeaderImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelFunctionHeaderImpl extends AsmIntelElementImpl implements AsmIntelFunctionHeader { - - public AsmIntelFunctionHeaderImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitFunctionHeader(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - - @Override - @Nullable - public AsmIntelFrameSize getFrameSize() { - return findChildByClass(AsmIntelFrameSize.class); - } - - @Override - @NotNull - public AsmIntelFunctionFlags getFunctionFlags() { - return findNotNullChildByClass(AsmIntelFunctionFlags.class); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionImpl.java deleted file mode 100644 index 080dcf140b..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelFunctionImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelFunctionImpl extends AsmIntelElementImpl implements AsmIntelFunction { - - public AsmIntelFunctionImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitFunction(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - - @Override - @NotNull - public AsmIntelFunctionBody getFunctionBody() { - return findNotNullChildByClass(AsmIntelFunctionBody.class); - } - - @Override - @NotNull - public AsmIntelFunctionHeader getFunctionHeader() { - return findNotNullChildByClass(AsmIntelFunctionHeader.class); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelInstructionStmtImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelInstructionStmtImpl.java deleted file mode 100644 index 14d9234e9a..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelInstructionStmtImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelInstructionStmtImpl extends AsmIntelElementImpl implements AsmIntelInstructionStmt { - - public AsmIntelInstructionStmtImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitInstructionStmt(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - - @Override - @NotNull - public AsmIntelOperands getOperands() { - return findNotNullChildByClass(AsmIntelOperands.class); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelLiteralImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelLiteralImpl.java deleted file mode 100644 index 8d863c90b9..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelLiteralImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelLiteralImpl extends AsmIntelElementImpl implements AsmIntelLiteral { - - public AsmIntelLiteralImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitLiteral(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelOperandsImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelOperandsImpl.java deleted file mode 100644 index 48e787714e..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelOperandsImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelOperandsImpl extends AsmIntelElementImpl implements AsmIntelOperands { - - public AsmIntelOperandsImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitOperands(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelPreprocessorDirectiveImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelPreprocessorDirectiveImpl.java deleted file mode 100644 index 7f9a399c04..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelPreprocessorDirectiveImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelPreprocessorDirectiveImpl extends AsmIntelElementImpl implements AsmIntelPreprocessorDirective { - - public AsmIntelPreprocessorDirectiveImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitPreprocessorDirective(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - -} diff --git a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelStatementImpl.java b/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelStatementImpl.java deleted file mode 100644 index db45830220..0000000000 --- a/plan9/gen/com/plan9/intel/lang/core/psi/impl/AsmIntelStatementImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -// This is a generated file. Not intended for manual editing. -package com.plan9.intel.lang.core.psi.impl; - -import java.util.List; -import org.jetbrains.annotations.*; -import com.intellij.lang.ASTNode; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.util.PsiTreeUtil; -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; -import com.plan9.intel.lang.core.psi.*; - -public class AsmIntelStatementImpl extends AsmIntelElementImpl implements AsmIntelStatement { - - public AsmIntelStatementImpl(ASTNode node) { - super(node); - } - - public void accept(@NotNull AsmIntelVisitor visitor) { - visitor.visitStatement(this); - } - - public void accept(@NotNull PsiElementVisitor visitor) { - if (visitor instanceof AsmIntelVisitor) accept((AsmIntelVisitor)visitor); - else super.accept(visitor); - } - - @Override - @Nullable - public AsmIntelFunction getFunction() { - return findChildByClass(AsmIntelFunction.class); - } - - @Override - @Nullable - public AsmIntelPreprocessorDirective getPreprocessorDirective() { - return findChildByClass(AsmIntelPreprocessorDirective.class); - } - -} diff --git a/plan9/resources/colorscheme/AsmIntelDarcula.xml b/plan9/resources/colorscheme/AsmIntelDarcula.xml deleted file mode 100644 index 381579daa0..0000000000 --- a/plan9/resources/colorscheme/AsmIntelDarcula.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/plan9/resources/colorscheme/AsmIntelDefault.xml b/plan9/resources/colorscheme/AsmIntelDefault.xml deleted file mode 100644 index b551c145bb..0000000000 --- a/plan9/resources/colorscheme/AsmIntelDefault.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - \ No newline at end of file diff --git a/plan9/resources/colorscheme/highlighterDemoText.s b/plan9/resources/colorscheme/highlighterDemoText.s deleted file mode 100644 index 9ada816945..0000000000 --- a/plan9/resources/colorscheme/highlighterDemoText.s +++ /dev/null @@ -1,13 +0,0 @@ -// a line comment -TEXT foo(SB),NOSPLIT,$24-8 - -label: - MOVB (SI)(BX*1), CX - XORL $0xffff, BX // convert EQ to NE - ANDL $0x0f0f >> 1, CX - CLD - CALL runtime·args(SB) - RET - -DATA bad_proc_msg<>+0x00(SB)/8, $"This pro" -DATA bad_proc_msg<>+0x08(SB)/8, $"gram can" diff --git a/plan9/resources/icons/CPU.png b/plan9/resources/icons/CPU.png deleted file mode 100644 index 9c44ac3b4f..0000000000 Binary files a/plan9/resources/icons/CPU.png and /dev/null differ diff --git a/plan9/resources/icons/CPU@2x.png b/plan9/resources/icons/CPU@2x.png deleted file mode 100644 index 5aff163257..0000000000 Binary files a/plan9/resources/icons/CPU@2x.png and /dev/null differ diff --git a/plan9/src/com/plan9/intel/AsmIntelFileType.java b/plan9/src/com/plan9/intel/AsmIntelFileType.java deleted file mode 100644 index bf92671fde..0000000000 --- a/plan9/src/com/plan9/intel/AsmIntelFileType.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan, Stuart Carnie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel; - -import com.plan9.intel.lang.AsmIntelLanguage; -import com.intellij.openapi.fileTypes.LanguageFileType; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import javax.swing.*; - -public class AsmIntelFileType extends LanguageFileType { - - public static final AsmIntelFileType INSTANCE = new AsmIntelFileType(); - - private AsmIntelFileType() { - super(AsmIntelLanguage.INSTANCE); - } - - @NotNull - @Override - public String getName() { - return "x86 Plan9 Assembly"; - } - - @NotNull - @Override - public String getDescription() { - return "x86 Plan9 Assembly file"; - } - - @NotNull - @Override - public String getDefaultExtension() { - return "s"; - } - - @Nullable - @Override - public Icon getIcon() { - return Icons.FILE; - } -} diff --git a/plan9/src/com/plan9/intel/AsmIntelFileTypeFactory.java b/plan9/src/com/plan9/intel/AsmIntelFileTypeFactory.java deleted file mode 100644 index 91ae7c9e25..0000000000 --- a/plan9/src/com/plan9/intel/AsmIntelFileTypeFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan, Stuart Carnie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel; - -import com.intellij.openapi.fileTypes.FileTypeConsumer; -import com.intellij.openapi.fileTypes.FileTypeFactory; -import com.intellij.openapi.fileTypes.WildcardFileNameMatcher; -import org.jetbrains.annotations.NotNull; - -public class AsmIntelFileTypeFactory extends FileTypeFactory { - @Override - public void createFileTypes(@NotNull FileTypeConsumer consumer) { - consumer.consume(AsmIntelFileType.INSTANCE, - new WildcardFileNameMatcher("*_amd64.s"), - new WildcardFileNameMatcher("*_amd64p32.s"), - new WildcardFileNameMatcher("*_386.s")); - } -} diff --git a/plan9/src/com/plan9/intel/Icons.java b/plan9/src/com/plan9/intel/Icons.java deleted file mode 100644 index 47aaa05fe5..0000000000 --- a/plan9/src/com/plan9/intel/Icons.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel; - -import com.intellij.openapi.util.IconLoader; - -import javax.swing.*; - -public class Icons { - public static final Icon FILE = IconLoader.getIcon("/icons/CPU.png"); - - private Icons() {} -} diff --git a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelColorsAndFontsPage.java b/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelColorsAndFontsPage.java deleted file mode 100644 index 053d4dcba2..0000000000 --- a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelColorsAndFontsPage.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.ide.highlighting; - -import com.intellij.openapi.editor.colors.TextAttributesKey; -import com.intellij.openapi.fileTypes.SyntaxHighlighter; -import com.intellij.openapi.options.colors.AttributesDescriptor; -import com.intellij.openapi.options.colors.ColorDescriptor; -import com.intellij.openapi.options.colors.ColorSettingsPage; -import com.intellij.util.ResourceUtil; -import com.plan9.intel.Icons; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import javax.swing.*; -import java.io.IOException; -import java.net.URL; -import java.util.Map; - -import static com.plan9.intel.ide.highlighting.AsmIntelSyntaxHighlightingColors.*; - -public class AsmIntelColorsAndFontsPage implements ColorSettingsPage { - private static final AttributesDescriptor[] DESCRIPTORS = new AttributesDescriptor[]{ - new AttributesDescriptor("Keyword", KEYWORD), - new AttributesDescriptor("Line Comment", LINE_COMMENT), - new AttributesDescriptor("Instruction", INSTRUCTION), - new AttributesDescriptor("Pseudo Instruction", PSEUDO_INSTRUCTION), - new AttributesDescriptor("String", STRING), - new AttributesDescriptor("Label", LABEL), - new AttributesDescriptor("Flags", FLAG), - new AttributesDescriptor("Registers", REGISTER), - new AttributesDescriptor("Parenthesis", PARENTHESIS), - new AttributesDescriptor("Operator", OPERATOR), - new AttributesDescriptor("Identifier", IDENTIFIER), - }; - - @Nullable - @Override - public Icon getIcon() { - return Icons.FILE; - } - - @NotNull - @Override - public SyntaxHighlighter getHighlighter() { - return new AsmIntelSyntaxHighlighter(); - } - - private String DEMO_TEXT; - - @NotNull - @Override - public String getDemoText() { - if (DEMO_TEXT == null) { - try { - URL resource = getClass().getClassLoader().getResource("colorscheme/highlighterDemoText.s"); - DEMO_TEXT = resource != null ? ResourceUtil.loadText(resource) : ""; - } - catch (IOException e) { - DEMO_TEXT = ""; - } - } - - return DEMO_TEXT; - } - - @Nullable - @Override - public Map getAdditionalHighlightingTagToDescriptorMap() { - return null; - } - - @NotNull - @Override - public AttributesDescriptor[] getAttributeDescriptors() { - return DESCRIPTORS; - } - - @NotNull - @Override - public ColorDescriptor[] getColorDescriptors() { - return ColorDescriptor.EMPTY_ARRAY; - } - - @NotNull - @Override - public String getDisplayName() { - return "x86 Assembler"; - } -} diff --git a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelHighlightingLexer.flex b/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelHighlightingLexer.flex deleted file mode 100644 index b6dd4ad9ee..0000000000 --- a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelHighlightingLexer.flex +++ /dev/null @@ -1,149 +0,0 @@ -package com.plan9.intel.lang.core.lexer; - -import com.intellij.lexer.FlexLexer; -import com.intellij.psi.tree.IElementType; -import com.intellij.psi.TokenType; -import static com.plan9.intel.ide.highlighting.AsmIntelLexerTokens.*; - -%% - -%public -%class _AsmIntelHighlightingLexer -%implements FlexLexer -%unicode -%function advance -%type IElementType - -%{ - public _AsmIntelHighlightingLexer() { - this((java.io.Reader)null); - } -%} - -WSNL = [ \r\n\t]+ -WS = [ \t\f] -LINE_COMMENT = "//" [^\r\n]* -STR = "\"" -LETTER = [:letter:] | "_" | \u00B7 | \u2215 -DIGIT = [:digit:] - -HEX_DIGIT = [0-9A-Fa-f] -INT_DIGIT = [0-9] -OPERATOR = [*/%&|+~\^-] - -NUM_INT = "0" | ([1-9] {INT_DIGIT}*) -NUM_HEX = ("0x" | "0X") {HEX_DIGIT}+ - -IDENT = {LETTER} ( {LETTER} | {DIGIT} )* - -LABEL = {IDENT} ":" - -DIRECTIVE = "TEXT" | "GLOBL" | "DATA" | "PCDATA" | "FUNCDATA" - -PSEUDO_REG = "FP" | "PC" | "SB" | "SP" - -REG = "AL" | "CL" | "DL" | "BL" | "SPB" | "BPB" | "SIB" | "DIB" | "R8B" | "R9B" | "R10B" | "R11B" | "R12B" | "R13B" | "R14B" | "R15B" | "AX" | - "CX" | "DX" | "BX" | "SP" | "BP" | "SI" | "DI" | "R8" | "R9" | "R10" | "R11" | "R12" | "R13" | "R14" | "R15" | "AH" | "CH" | "DH" | "BH" | - "F0" | "F1" | "F2" | "F3" | "F4" | "F5" | "F6" | "F7" | "M0" | "M1" | "M2" | "M3" | "M4" | "M5" | "M6" | "M7" | "X0" | "X1" | "X2" | "X3" | - "X4" | "X5" | "X6" | "X7" | "X8" | "X9" | "X10" | "X11" | "X12" | "X13" | "X14" | "X15" | "CS" | "SS" | "DS" | "ES" | "FS" | "GS" | "GDTR" | - "IDTR" | "LDTR" | "MSW" | "TASK" | "CR0" | "CR1" | "CR2" | "CR3" | "CR4" | "CR5" | "CR6" | "CR7" | "CR8" | "CR9" | "CR10" | "CR11" | "CR12" - | "CR13" | "CR14" | "CR15" | "DR0" | "DR1" | "DR2" | "DR3" | "DR4" | "DR5" | "DR6" | "DR7" | "TR0" | "TR1" | "TR2" | "TR3" | "TR4" | "TR5" | - "TR6" | "TR7" | "TLS" - -PSEUDO_INS = "CALL" | "END" | "JMP" | "NOP" | "RET" - -// all instructions, including alternates per https://github.com/golang/go/blob/8db371b3d58a1c139f0854738f9962de05ca5d7a/src/cmd/asm/internal/arch/arch.go#L114 -INS = "AAA" | "AAD" | "AAM" | "AAS" | "ADCB" | "ADCL" | "ADCQ" | "ADCW" | "ADDB" | "ADDL" | "ADDPD" | "ADDPS" | "ADDQ" | "ADDSD" | "ADDSS" | - "ADDW" | "ADJSP" | "AESDEC" | "AESDECLAST" | "AESENC" | "AESENCLAST" | "AESIMC" | "AESKEYGENASSIST" | "ANDB" | "ANDL" | "ANDNPD" | "ANDNPS" - | "ANDPD" | "ANDPS" | "ANDQ" | "ANDW" | "ARPL" | "BOUNDL" | "BOUNDW" | "BSFL" | "BSFQ" | "BSFW" | "BSRL" | "BSRQ" | "BSRW" | "BSWAPL" | - "BSWAPQ" | "BTCL" | "BTCQ" | "BTCW" | "BTL" | "BTQ" | "BTRL" | "BTRQ" | "BTRW" | "BTSL" | "BTSQ" | "BTSW" | "BTW" | "BYTE" | "CDQ" | "CLC" | - "CLD" | "CLI" | "CLTS" | "CMC" | "CMOVLCC" | "CMOVLCS" | "CMOVLEQ" | "CMOVLGE" | "CMOVLGT" | "CMOVLHI" | "CMOVLLE" | "CMOVLLS" | "CMOVLLT" | - "CMOVLMI" | "CMOVLNE" | "CMOVLOC" | "CMOVLOS" | "CMOVLPC" | "CMOVLPL" | "CMOVLPS" | "CMOVQCC" | "CMOVQCS" | "CMOVQEQ" | "CMOVQGE" | - "CMOVQGT" | "CMOVQHI" | "CMOVQLE" | "CMOVQLS" | "CMOVQLT" | "CMOVQMI" | "CMOVQNE" | "CMOVQOC" | "CMOVQOS" | "CMOVQPC" | "CMOVQPL" | - "CMOVQPS" | "CMOVWCC" | "CMOVWCS" | "CMOVWEQ" | "CMOVWGE" | "CMOVWGT" | "CMOVWHI" | "CMOVWLE" | "CMOVWLS" | "CMOVWLT" | "CMOVWMI" | - "CMOVWNE" | "CMOVWOC" | "CMOVWOS" | "CMOVWPC" | "CMOVWPL" | "CMOVWPS" | "CMPB" | "CMPL" | "CMPPD" | "CMPPS" | "CMPQ" | "CMPSB" | "CMPSD" | - "CMPSL" | "CMPSQ" | "CMPSS" | "CMPSW" | "CMPW" | "CMPXCHG8B" | "CMPXCHGB" | "CMPXCHGL" | "CMPXCHGQ" | "CMPXCHGW" | "COMISD" | "COMISS" | - "CPUID" | "CQO" | "CRC32B" | "CRC32Q" | "CVTPD2PL" | "CVTPD2PS" | "CVTPL2PD" | "CVTPL2PS" | "CVTPS2PD" | "CVTPS2PL" | "CVTSD2SL" | - "CVTSD2SQ" | "CVTSD2SS" | "CVTSL2SD" | "CVTSL2SS" | "CVTSQ2SD" | "CVTSQ2SS" | "CVTSS2SD" | "CVTSS2SL" | "CVTSS2SQ" | "CVTTPD2PL" | - "CVTTPS2PL" | "CVTTSD2SL" | "CVTTSD2SQ" | "CVTTSS2SL" | "CVTTSS2SQ" | "CWD" | "DAA" | "DAS" | "DECB" | "DECL" | "DECQ" | "DECW" | "DIVB" | - "DIVL" | "DIVPD" | "DIVPS" | "DIVQ" | "DIVSD" | "DIVSS" | "DIVW" | "EMMS" | "ENTER" | "F2XM1" | "FABS" | "FADDD" | "FADDDP" | "FADDF" | - "FADDL" | "FADDW" | "FCHS" | "FCLEX" | "FCMOVCC" | "FCMOVCS" | "FCMOVEQ" | "FCMOVHI" | "FCMOVLS" | "FCMOVNE" | "FCMOVNU" | "FCMOVUN" | - "FCOMB" | "FCOMBP" | "FCOMD" | "FCOMDP" | "FCOMDPP" | "FCOMF" | "FCOMFP" | "FCOMI" | "FCOMIP" | "FCOML" | "FCOMLP" | "FCOMW" | "FCOMWP" | - "FCOS" | "FDECSTP" | "FDIVD" | "FDIVDP" | "FDIVF" | "FDIVL" | "FDIVRD" | "FDIVRDP" | "FDIVRF" | "FDIVRL" | "FDIVRW" | "FDIVW" | "FFREE" | - "FINCSTP" | "FINIT" | "FLD1" | "FLDCW" | "FLDENV" | "FLDL2E" | "FLDL2T" | "FLDLG2" | "FLDLN2" | "FLDPI" | "FLDZ" | "FMOVB" | "FMOVBP" | - "FMOVD" | "FMOVDP" | "FMOVF" | "FMOVFP" | "FMOVL" | "FMOVLP" | "FMOVV" | "FMOVVP" | "FMOVW" | "FMOVWP" | "FMOVX" | "FMOVXP" | "FMULD" | - "FMULDP" | "FMULF" | "FMULL" | "FMULW" | "FNOP" | "FPATAN" | "FPREM" | "FPREM1" | "FPTAN" | "FRNDINT" | "FRSTOR" | "FSAVE" | "FSCALE" | - "FSIN" | "FSINCOS" | "FSQRT" | "FSTCW" | "FSTENV" | "FSTSW" | "FSUBD" | "FSUBDP" | "FSUBF" | "FSUBL" | "FSUBRD" | "FSUBRDP" | "FSUBRF" | - "FSUBRL" | "FSUBRW" | "FSUBW" | "FTST" | "FUCOM" | "FUCOMI" | "FUCOMIP" | "FUCOMP" | "FUCOMPP" | "FXAM" | "FXCHD" | "FXRSTOR" | "FXRSTOR64" - | "FXSAVE" | "FXSAVE64" | "FXTRACT" | "FYL2X" | "FYL2XP1" | "HLT" | "IDIVB" | "IDIVL" | "IDIVQ" | "IDIVW" | "IMUL3Q" | "IMULB" | "IMULL" | - "IMULQ" | "IMULW" | "INB" | "INCB" | "INCL" | "INCQ" | "INCW" | "INL" | "INSB" | "INSL" | "INSW" | "INT" | "INTO" | "INVD" | "INVLPG" | - "INW" | "IRETL" | "IRETQ" | "IRETW" | "JA" | "JAE" | "JB" | "JBE" | "JC" | "JCC" | "JCS" | "JCXZL" | "JCXZQ" | "JCXZW" | "JE" | "JEQ" | "JG" - | "JGE" | "JGT" | "JHI" | "JHS" | "JL" | "JLE" | "JLO" | "JLS" | "JLT" | "JMI" | "JNA" | "JNAE" | "JNB" | "JNBE" | "JNC" | "JNE" | "JNG" | - "JNGE" | "JNL" | "JNLE" | "JNO" | "JNP" | "JNS" | "JNZ" | "JO" | "JOC" | "JOS" | "JP" | "JPC" | "JPE" | "JPL" | "JPO" | "JPS" | "JS" | "JZ" - | "LAHF" | "LARL" | "LARW" | "LAST" | "LDMXCSR" | "LEAL" | "LEAQ" | "LEAVEL" | "LEAVEQ" | "LEAVEW" | "LEAW" | "LFENCE" | "LOCK" | "LODSB" | - "LODSL" | "LODSQ" | "LODSW" | "LONG" | "LOOP" | "LOOPEQ" | "LOOPNE" | "LSLL" | "LSLW" | "MASKMOVDQU" | "MASKMOVOU" | "MASKMOVQ" | "MAXPD" | - "MAXPS" | "MAXSD" | "MAXSS" | "MFENCE" | "MINPD" | "MINPS" | "MINSD" | "MINSS" | "MODE" | "MOVAPD" | "MOVAPS" | "MOVB" | "MOVBLSX" | - "MOVBLZX" | "MOVBQSX" | "MOVBQZX" | "MOVBWSX" | "MOVBWZX" | "MOVD" | "MOVDQ2Q" | "MOVHDA" | "MOVHDU" | "MOVHLPS" | "MOVHPD" | "MOVHPS" | - "MOVL" | "MOVLHPS" | "MOVLPD" | "MOVLPS" | "MOVLQSX" | "MOVLQZX" | "MOVMSKPD" | "MOVMSKPS" | "MOVNTDQ" | "MOVNTHD" | "MOVNTIL" | "MOVNTIQ" | - "MOVNTO" | "MOVNTPD" | "MOVNTPS" | "MOVNTQ" | "MOVO" | "MOVOA" | "MOVOU" | "MOVQ" | "MOVQL" | "MOVQOZX" | "MOVSB" | "MOVSD" | "MOVSL" | - "MOVSQ" | "MOVSS" | "MOVSW" | "MOVUPD" | "MOVUPS" | "MOVW" | "MOVWLSX" | "MOVWLZX" | "MOVWQSX" | "MOVWQZX" | "MULB" | "MULL" | "MULPD" | - "MULPS" | "MULQ" | "MULSD" | "MULSS" | "MULW" | "NEGB" | "NEGL" | "NEGQ" | "NEGW" | "NOTB" | "NOTL" | "NOTQ" | "NOTW" | "ORB" | "ORL" | - "ORPD" | "ORPS" | "ORQ" | "ORW" | "OUTB" | "OUTL" | "OUTSB" | "OUTSL" | "OUTSW" | "OUTW" | "PACKSSLW" | "PACKSSWB" | "PACKUSWB" | "PADDB" | - "PADDL" | "PADDQ" | "PADDSB" | "PADDSW" | "PADDUSB" | "PADDUSW" | "PADDW" | "PAND" | "PANDB" | "PANDL" | "PANDN" | "PANDSB" | "PANDSW" | - "PANDUSB" | "PANDUSW" | "PANDW" | "PAUSE" | "PAVGB" | "PAVGW" | "PCLMULQDQ" | "PCMPEQB" | "PCMPEQL" | "PCMPEQW" | "PCMPGTB" | "PCMPGTL" | - "PCMPGTW" | "PEXTRW" | "PF2ID" | "PF2IL" | "PF2IW" | "PFACC" | "PFADD" | "PFCMPEQ" | "PFCMPGE" | "PFCMPGT" | "PFMAX" | "PFMIN" | "PFMUL" | - "PFNACC" | "PFPNACC" | "PFRCP" | "PFRCPI2T" | "PFRCPIT1" | "PFRSQIT1" | "PFRSQRT" | "PFSUB" | "PFSUBR" | "PI2FD" | "PI2FL" | "PI2FW" | - "PINSRD" | "PINSRQ" | "PINSRW" | "PMADDWL" | "PMAXSW" | "PMAXUB" | "PMINSW" | "PMINUB" | "PMOVMSKB" | "PMULHRW" | "PMULHUW" | "PMULHW" | - "PMULLW" | "PMULULQ" | "POPAL" | "POPAW" | "POPFL" | "POPFQ" | "POPFW" | "POPL" | "POPQ" | "POPW" | "POR" | "PREFETCHNTA" | "PREFETCHT0" | - "PREFETCHT1" | "PREFETCHT2" | "PSADBW" | "PSHUFB" | "PSHUFD" | "PSHUFHW" | "PSHUFL" | "PSHUFLW" | "PSHUFW" | "PSLLDQ" | "PSLLL" | "PSLLO" | - "PSLLQ" | "PSLLW" | "PSRAL" | "PSRAW" | "PSRLDQ" | "PSRLL" | "PSRLO" | "PSRLQ" | "PSRLW" | "PSUBB" | "PSUBL" | "PSUBQ" | "PSUBSB" | "PSUBSW" - | "PSUBUSB" | "PSUBUSW" | "PSUBW" | "PSWAPL" | "PUNPCKHBW" | "PUNPCKHLQ" | "PUNPCKHQDQ" | "PUNPCKHWL" | "PUNPCKLBW" | "PUNPCKLLQ" | - "PUNPCKLQDQ" | "PUNPCKLWL" | "PUSHAL" | "PUSHAW" | "PUSHFL" | "PUSHFQ" | "PUSHFW" | "PUSHL" | "PUSHQ" | "PUSHW" | "PXOR" | "QUAD" | "RCLB" | - "RCLL" | "RCLQ" | "RCLW" | "RCPPS" | "RCPSS" | "RCRB" | "RCRL" | "RCRQ" | "RCRW" | "RDMSR" | "RDPMC" | "RDTSC" | "REP" | "REPN" | "RETFL" | - "RETFQ" | "RETFW" | "ROLB" | "ROLL" | "ROLQ" | "ROLW" | "RORB" | "RORL" | "RORQ" | "RORW" | "ROUNDPD" | "ROUNDPS" | "ROUNDSD" | "ROUNDSS" | - "RSM" | "RSQRTPS" | "RSQRTSS" | "SAHF" | "SALB" | "SALL" | "SALQ" | "SALW" | "SARB" | "SARL" | "SARQ" | "SARW" | "SBBB" | "SBBL" | "SBBQ" | - "SBBW" | "SCASB" | "SCASL" | "SCASQ" | "SCASW" | "SETCC" | "SETCS" | "SETEQ" | "SETGE" | "SETGT" | "SETHI" | "SETLE" | "SETLS" | "SETLT" | - "SETMI" | "SETNE" | "SETOC" | "SETOS" | "SETPC" | "SETPL" | "SETPS" | "SFENCE" | "SHLB" | "SHLL" | "SHLQ" | "SHLW" | "SHRB" | "SHRL" | - "SHRQ" | "SHRW" | "SHUFPD" | "SHUFPS" | "SQRTPD" | "SQRTPS" | "SQRTSD" | "SQRTSS" | "STC" | "STD" | "STI" | "STMXCSR" | "STOSB" | "STOSL" | - "STOSQ" | "STOSW" | "SUBB" | "SUBL" | "SUBPD" | "SUBPS" | "SUBQ" | "SUBSD" | "SUBSS" | "SUBW" | "SWAPGS" | "SYSCALL" | "SYSRET" | "TESTB" | - "TESTL" | "TESTQ" | "TESTW" | "UCOMISD" | "UCOMISS" | "UNPCKHPD" | "UNPCKHPS" | "UNPCKLPD" | "UNPCKLPS" | "VERR" | "VERW" | "VPAND" | - "VPBROADCASTB" | "VPCMPEQB" | "VPMOVMSKB" | "VPTEST" | "VPXOR" | "VZEROUPPER" | "WAIT" | "WBINVD" | "WORD" | "WRMSR" | "XABORT" | "XACQUIRE" - | "XADDB" | "XADDL" | "XADDQ" | "XADDW" | "XBEGIN" | "XCHGB" | "XCHGL" | "XCHGQ" | "XCHGW" | "XEND" | "XLAT" | "XORB" | "XORL" | "XORPD" | - "XORPS" | "XORQ" | "XORW" | "XRELEASE" | "XTEST" - -PREPROCESSOR = "#include" | "#define" | "#ifdef" | "#else" | "#endif" | "#undef" - -FLAG = "NOPROF" | "DUPOK" | "NOSPLIT" | "RODATA" | "NOPTR" | "WRAPPER" | "NEEDCTXT" | "TLSBSS" | "NOFRAME" - -%% - -{PREPROCESSOR} { return PREPROCESSOR; } -{DIRECTIVE} { return DIRECTIVE; } - -{FLAG} { return FLAG; } -{PSEUDO_REG} { return PSEUDO_REG; } -{REG} { return REGISTER; } -{PSEUDO_INS} { return PSEUDO_INS; } -{INS} { return INSTRUCTION; } -{LINE_COMMENT} { return LINE_COMMENT; } -{WS} { return TokenType.WHITE_SPACE; } -{WSNL} { return TokenType.WHITE_SPACE; } -{LABEL} { return LABEL; } -"(" { return PAREN; } -")" { return PAREN; } -"," { return COMMA; } -{OPERATOR} { return OPERATOR; } -"<<" | ">>" { return OPERATOR; } - -{NUM_HEX} { return HEX; } -{NUM_INT} { return INT; } - -{IDENT} { return IDENTIFIER; } - -{STR} [^\"]* {STR} { return STRING; } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Catch All -/////////////////////////////////////////////////////////////////////////////////////////////////// - -[^] { return com.intellij.psi.TokenType.BAD_CHARACTER; } \ No newline at end of file diff --git a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelHighlightingLexer.java b/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelHighlightingLexer.java deleted file mode 100644 index 6c12d2e16e..0000000000 --- a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelHighlightingLexer.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.ide.highlighting; - -import com.intellij.lexer.FlexAdapter; -import com.plan9.intel.lang.core.lexer._AsmIntelHighlightingLexer; - -public class AsmIntelHighlightingLexer extends FlexAdapter { - public AsmIntelHighlightingLexer() { - super(new _AsmIntelHighlightingLexer()); - } -} diff --git a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelLexerTokens.java b/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelLexerTokens.java deleted file mode 100644 index a97407d2c9..0000000000 --- a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelLexerTokens.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.ide.highlighting; - -import com.intellij.psi.tree.IElementType; -import com.intellij.psi.tree.TokenSet; -import com.plan9.intel.lang.core.lexer.AsmIntelTokenType; - -public class AsmIntelLexerTokens { - public static final IElementType LINE_COMMENT = new AsmIntelTokenType("LINE_COMMENT"); - - public static final IElementType OPERATOR = new AsmIntelTokenType("operator"); - public static final IElementType PAREN = new AsmIntelTokenType("PAREN"); - public static final IElementType COLON = new AsmIntelTokenType(":"); - public static final IElementType COMMA = new AsmIntelTokenType(","); - - public static final IElementType FLAG = new AsmIntelTokenType("FLAG"); - - public static final IElementType HEX = new AsmIntelTokenType("hex"); - public static final IElementType INT = new AsmIntelTokenType("int"); - - public static final IElementType IDENTIFIER = new AsmIntelTokenType("identifier"); - public static final IElementType PREPROCESSOR = new AsmIntelTokenType("PREPROCESSOR"); - public static final IElementType PSEUDO_INS = new AsmIntelTokenType("PSEUDO_INS"); - public static final IElementType INSTRUCTION = new AsmIntelTokenType("INSTRUCTION"); - public static final IElementType LABEL = new AsmIntelTokenType("LABEL"); - public static final IElementType PSEUDO_REG = new AsmIntelTokenType("PSEUDO_REG"); - public static final IElementType REGISTER = new AsmIntelTokenType("REGISTER"); - public static final IElementType STRING = new AsmIntelTokenType("STRING"); - - public static final IElementType DIRECTIVE = new AsmIntelTokenType("DIRECTIVE"); - - public static final TokenSet KEYWORDS = TokenSet.create(DIRECTIVE); - public static final TokenSet NUMBERS = TokenSet.create(HEX, INT); - public static final TokenSet REGISTERS = TokenSet.create(PSEUDO_REG, REGISTER); - - private AsmIntelLexerTokens() {} -} diff --git a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelSyntaxHighlighter.java b/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelSyntaxHighlighter.java deleted file mode 100644 index d6616da4c2..0000000000 --- a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelSyntaxHighlighter.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.ide.highlighting; - -import com.intellij.lexer.Lexer; -import com.intellij.openapi.editor.colors.TextAttributesKey; -import com.intellij.openapi.fileTypes.SyntaxHighlighterBase; -import com.intellij.psi.tree.IElementType; -import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.NotNull; - -import java.util.Map; - -import static com.plan9.intel.ide.highlighting.AsmIntelSyntaxHighlightingColors.*; - -public class AsmIntelSyntaxHighlighter extends SyntaxHighlighterBase { - - private static final Map ATTRIBUTES = ContainerUtil.newHashMap(); - - static { - fillMap(ATTRIBUTES, LINE_COMMENT, AsmIntelLexerTokens.LINE_COMMENT); - fillMap(ATTRIBUTES, INSTRUCTION, AsmIntelLexerTokens.INSTRUCTION); - fillMap(ATTRIBUTES, PSEUDO_INSTRUCTION, AsmIntelLexerTokens.PSEUDO_INS); - fillMap(ATTRIBUTES, STRING, AsmIntelLexerTokens.STRING); - fillMap(ATTRIBUTES, LABEL, AsmIntelLexerTokens.LABEL); - fillMap(ATTRIBUTES, FLAG, AsmIntelLexerTokens.FLAG); - fillMap(ATTRIBUTES, OPERATOR, AsmIntelLexerTokens.OPERATOR); - fillMap(ATTRIBUTES, PARENTHESIS, AsmIntelLexerTokens.PAREN); - fillMap(ATTRIBUTES, IDENTIFIER, AsmIntelLexerTokens.IDENTIFIER); - fillMap(ATTRIBUTES, PREPROCESSOR, AsmIntelLexerTokens.PREPROCESSOR); - - fillMap(ATTRIBUTES, AsmIntelLexerTokens.KEYWORDS, KEYWORD); - fillMap(ATTRIBUTES, AsmIntelLexerTokens.NUMBERS, NUMBER); - fillMap(ATTRIBUTES, AsmIntelLexerTokens.REGISTERS, REGISTER); - } - - @NotNull - @Override - public Lexer getHighlightingLexer() { - return new AsmIntelHighlightingLexer(); - } - - @Override - @NotNull - public TextAttributesKey[] getTokenHighlights(IElementType tokenType) { - return pack(ATTRIBUTES.get(tokenType)); - } -} diff --git a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelSyntaxHighlighterFactory.java b/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelSyntaxHighlighterFactory.java deleted file mode 100644 index f3fa870331..0000000000 --- a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelSyntaxHighlighterFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan, Stuart Carnie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.ide.highlighting; - -import com.intellij.openapi.fileTypes.SyntaxHighlighter; -import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class AsmIntelSyntaxHighlighterFactory extends SyntaxHighlighterFactory { - @NotNull - @Override - public SyntaxHighlighter getSyntaxHighlighter(@Nullable Project project, @Nullable VirtualFile file) { - return new AsmIntelSyntaxHighlighter(); - } -} diff --git a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelSyntaxHighlightingColors.java b/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelSyntaxHighlightingColors.java deleted file mode 100644 index 3de4ef6c31..0000000000 --- a/plan9/src/com/plan9/intel/ide/highlighting/AsmIntelSyntaxHighlightingColors.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan, Stuart Carnie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.ide.highlighting; - -import com.intellij.openapi.editor.DefaultLanguageHighlighterColors; -import com.intellij.openapi.editor.colors.TextAttributesKey; - -import static com.intellij.openapi.editor.colors.TextAttributesKey.createTextAttributesKey; - -public class AsmIntelSyntaxHighlightingColors { - public static final TextAttributesKey LINE_COMMENT = createTextAttributesKey("com.plan9.LINE_COMMENT", DefaultLanguageHighlighterColors.LINE_COMMENT); - public static final TextAttributesKey INSTRUCTION = createTextAttributesKey("com.plan9.INSTRUCTION", DefaultLanguageHighlighterColors.PREDEFINED_SYMBOL); - public static final TextAttributesKey PSEUDO_INSTRUCTION = createTextAttributesKey("com.plan9.PSEUDO_INSTRUCTION", INSTRUCTION); - public static final TextAttributesKey KEYWORD = createTextAttributesKey("com.plan9.KEYWORD", DefaultLanguageHighlighterColors.KEYWORD); - public static final TextAttributesKey STRING = createTextAttributesKey("com.plan9.STRING", DefaultLanguageHighlighterColors.STRING); - public static final TextAttributesKey NUMBER = createTextAttributesKey("com.plan9.NUMBER", DefaultLanguageHighlighterColors.NUMBER); - public static final TextAttributesKey LABEL = createTextAttributesKey("com.plan9.LABEL", DefaultLanguageHighlighterColors.LABEL); - public static final TextAttributesKey FLAG = createTextAttributesKey("com.plan9.FLAG", DefaultLanguageHighlighterColors.GLOBAL_VARIABLE); - public static final TextAttributesKey REGISTER = createTextAttributesKey("com.plan9.REGISTER", DefaultLanguageHighlighterColors.PARAMETER); - public static final TextAttributesKey PARENTHESIS = createTextAttributesKey("com.plan9.PARENTHESIS", DefaultLanguageHighlighterColors.PARENTHESES); - public static final TextAttributesKey OPERATOR = createTextAttributesKey("com.plan9.OPERATOR", DefaultLanguageHighlighterColors.OPERATION_SIGN); - public static final TextAttributesKey DIRECTIVE = createTextAttributesKey("com.plan9.DIRECTIVE", DefaultLanguageHighlighterColors.KEYWORD); - public static final TextAttributesKey IDENTIFIER = createTextAttributesKey("com.plan9.IDENTIFIER", DefaultLanguageHighlighterColors.IDENTIFIER); - public static final TextAttributesKey PREPROCESSOR = createTextAttributesKey("com.plan9.PREPROCESSOR", DefaultLanguageHighlighterColors.KEYWORD); - -} diff --git a/plan9/src/com/plan9/intel/lang/AsmIntelLanguage.java b/plan9/src/com/plan9/intel/lang/AsmIntelLanguage.java deleted file mode 100644 index 6da178203a..0000000000 --- a/plan9/src/com/plan9/intel/lang/AsmIntelLanguage.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan, Stuart Carnie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.lang; - -import com.intellij.lang.Language; - -public class AsmIntelLanguage extends Language { - public static final AsmIntelLanguage INSTANCE = new AsmIntelLanguage(); - - private AsmIntelLanguage() { - super("plan9_x86"); - } -} diff --git a/plan9/src/com/plan9/intel/lang/core/AsmIntelParserDefinition.java b/plan9/src/com/plan9/intel/lang/core/AsmIntelParserDefinition.java deleted file mode 100644 index 1b36e2f6d5..0000000000 --- a/plan9/src/com/plan9/intel/lang/core/AsmIntelParserDefinition.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.lang.core; - -import com.intellij.lang.ASTNode; -import com.intellij.lang.Language; -import com.intellij.lang.ParserDefinition; -import com.intellij.lang.PsiParser; -import com.intellij.lexer.Lexer; -import com.intellij.openapi.project.Project; -import com.intellij.psi.FileViewProvider; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.TokenType; -import com.intellij.psi.tree.IElementType; -import com.intellij.psi.tree.IFileElementType; -import com.intellij.psi.tree.TokenSet; -import com.plan9.intel.lang.AsmIntelLanguage; -import com.plan9.intel.lang.core.lexer.AsmIntelLexer; -import com.plan9.intel.lang.core.lexer.AsmIntelTokenType; -import com.plan9.intel.lang.core.parser.AsmIntelParser; -import com.plan9.intel.lang.core.psi.AsmIntelFile; -import org.jetbrains.annotations.NotNull; - -import static com.plan9.intel.lang.core.psi.AsmIntelTypes.*; - -public class AsmIntelParserDefinition implements ParserDefinition { - - public static final IElementType LINE_COMMENT = new AsmIntelTokenType("LINE_COMMENT"); - - private static final TokenSet WHITE_SPACES = TokenSet.create(TokenType.WHITE_SPACE); - - private static final TokenSet COMMENTS = TokenSet.create(LINE_COMMENT); - public static final TokenSet KEYWORDS = TokenSet.create(TEXT); - public static final TokenSet NUMBERS = TokenSet.create(HEX, INT); - public static final TokenSet REGISTERS = TokenSet.create(PSEUDO_REG); - - public static final IFileElementType FILE = new IFileElementType(Language.findInstance(AsmIntelLanguage.class)); - - @NotNull - @Override - public Lexer createLexer(Project project) { - return new AsmIntelLexer(); - } - - @Override - @NotNull - public TokenSet getWhitespaceTokens() { - return WHITE_SPACES; - } - - @Override - @NotNull - public TokenSet getCommentTokens() { - return COMMENTS; - } - - @Override - @NotNull - public TokenSet getStringLiteralElements() { - return TokenSet.EMPTY; - } - - @Override - @NotNull - public PsiParser createParser(Project project) { - return new AsmIntelParser(); - } - - @Override - public IFileElementType getFileNodeType() { - return FILE; - } - - @Override - public PsiFile createFile(FileViewProvider viewProvider) { - return new AsmIntelFile(viewProvider); - } - - @Override - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { - return SpaceRequirements.MAY; - } - - @Override - @NotNull - public PsiElement createElement(ASTNode node) { - return Factory.createElement(node); - } -} diff --git a/plan9/src/com/plan9/intel/lang/core/grammar/x86.bnf b/plan9/src/com/plan9/intel/lang/core/grammar/x86.bnf deleted file mode 100644 index a91760ff5f..0000000000 --- a/plan9/src/com/plan9/intel/lang/core/grammar/x86.bnf +++ /dev/null @@ -1,36 +0,0 @@ -{ - parserClass="com.plan9.intel.lang.core.parser.AsmIntelParser" - - extends='com.plan9.intel.lang.core.psi.impl.AsmIntelElementImpl' - extends="com.intellij.extapi.psi.ASTWrapperPsiElement" - - psiClassPrefix="AsmIntel" - psiImplClassSuffix="Impl" - psiPackage="com.plan9.intel.lang.core.psi" - psiImplPackage="com.plan9.intel.lang.core.psi.impl" - - elementTypeHolderClass="com.plan9.intel.lang.core.psi.AsmIntelTypes" - elementTypeClass="com.plan9.intel.lang.core.psi.AsmIntelElementType" - tokenTypeClass="com.plan9.intel.lang.core.lexer.AsmIntelTokenType" - - tokens = [ - COLON = ':' - LPAREN = '(' - RPAREN = ')' - COMMA = ',' - COMMA = ',' - BIT_OR = '|' - ] -} - -File ::= Statement* -Statement ::= PreprocessorDirective | Function -PreprocessorDirective ::= import STRING -Function ::= FunctionHeader FunctionBody -FunctionHeader ::= TEXT identifier '(' PSEUDO_REG ')' ',' FunctionFlags [',' FrameSize] -FunctionFlags ::= FLAG | '(' FLAG ( '|' FLAG )* ')' -FrameSize ::= '$' Literal ['-' Literal] -FunctionBody ::= ( InstructionStmt | LABEL )* -InstructionStmt ::= INSTRUCTION Operands -Operands ::= -Literal ::= int | hex diff --git a/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelLexer.flex b/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelLexer.flex deleted file mode 100644 index 73f2e04e35..0000000000 --- a/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelLexer.flex +++ /dev/null @@ -1,130 +0,0 @@ -package com.plan9.intel.lang.core.lexer; - -import com.intellij.lexer.FlexLexer; -import com.intellij.psi.tree.IElementType; -import com.plan9.intel.lang.core.psi.AsmIntelTypes; -import com.intellij.psi.TokenType; -import static com.plan9.intel.lang.core.AsmIntelParserDefinition.*; - -%% - -%public -%class _AsmIntelLexer -%implements FlexLexer, AsmIntelTypes -%unicode -%function advance -%type IElementType - -%{ - public _AsmIntelLexer() { - this((java.io.Reader)null); - } -%} - -WSNL = [ \r\n\t]+ -WS = [ \t\f] -LINE_COMMENT = "//" [^\r\n]* -STR = "\"" -LETTER = [:letter:] | "_" -DIGIT = [:digit:] - -HEX_DIGIT = [0-9A-Fa-f] -INT_DIGIT = [0-9] - -NUM_INT = "0" | ([1-9] {INT_DIGIT}*) -NUM_HEX = ("0x" | "0X") {HEX_DIGIT}+ - -IDENT = {LETTER} ( {LETTER} | {DIGIT} )* - -LABEL = {IDENT} ":" - -PSEUDO_REG = "FP" | "PC" | "SB" | "SP" - -INS = "AAA" | "AAD" | "AAM" | "AAS" | "ADCB" | "ADCL" | "ADCW" | "ADDB" | "ADDL" | "ADDW" | "ADJSP" | "ANDB" | "ANDL" | "ANDW" | "ARPL" | "BOUNDL" - | "BOUNDW" | "BSFL" | "BSFW" | "BSRL" | "BSRW" | "BTL" | "BTW" | "BTCL" | "BTCW" | "BTRL" | "BTRW" | "BTSL" | "BTSW" | "BYTE" | "CLC" | - "CLD" | "CLI" | "CLTS" | "CMC" | "CMPB" | "CMPL" | "CMPW" | "CMPSB" | "CMPSL" | "CMPSW" | "DAA" | "DAS" | "DECB" | "DECL" | "DECQ" | "DECW" - | "DIVB" | "DIVL" | "DIVW" | "ENTER" | "HLT" | "IDIVB" | "IDIVL" | "IDIVW" | "IMULB" | "IMULL" | "IMULW" | "INB" | "INL" | "INW" | "INCB" | - "INCL" | "INCQ" | "INCW" | "INSB" | "INSL" | "INSW" | "INT" | "INTO" | "IRETL" | "IRETW" | "JCC" | "JCS" | "JCXZL" | "JEQ" | "JGE" | "JGT" | - "JHI" | "JLE" | "JLS" | "JLT" | "JMI" | "JNE" | "JOC" | "JOS" | "JPC" | "JPL" | "JPS" | "LAHF" | "LARL" | "LARW" | "LEAL" | "LEAW" | - "LEAVEL" | "LEAVEW" | "LOCK" | "LODSB" | "LODSL" | "LODSW" | "LONG" | "LOOP" | "LOOPEQ" | "LOOPNE" | "LSLL" | "LSLW" | "MOVB" | "MOVL" | - "MOVW" | "MOVBLSX" | "MOVBLZX" | "MOVBQSX" | "MOVBQZX" | "MOVBWSX" | "MOVBWZX" | "MOVWLSX" | "MOVWLZX" | "MOVWQSX" | "MOVWQZX" | "MOVSB" | - "MOVSL" | "MOVSW" | "MULB" | "MULL" | "MULW" | "NEGB" | "NEGL" | "NEGW" | "NOTB" | "NOTL" | "NOTW" | "ORB" | "ORL" | "ORW" | "OUTB" | "OUTL" - | "OUTW" | "OUTSB" | "OUTSL" | "OUTSW" | "PAUSE" | "POPAL" | "POPAW" | "POPFL" | "POPFW" | "POPL" | "POPW" | "PUSHAL" | "PUSHAW" | "PUSHFL" - | "PUSHFW" | "PUSHL" | "PUSHW" | "RCLB" | "RCLL" | "RCLW" | "RCRB" | "RCRL" | "RCRW" | "REP" | "REPN" | "ROLB" | "ROLL" | "ROLW" | "RORB" | - "RORL" | "RORW" | "SAHF" | "SALB" | "SALL" | "SALW" | "SARB" | "SARL" | "SARW" | "SBBB" | "SBBL" | "SBBW" | "SCASB" | "SCASL" | "SCASW" | - "SETCC" | "SETCS" | "SETEQ" | "SETGE" | "SETGT" | "SETHI" | "SETLE" | "SETLS" | "SETLT" | "SETMI" | "SETNE" | "SETOC" | "SETOS" | "SETPC" | - "SETPL" | "SETPS" | "CDQ" | "CWD" | "SHLB" | "SHLL" | "SHLW" | "SHRB" | "SHRL" | "SHRW" | "STC" | "STD" | "STI" | "STOSB" | "STOSL" | - "STOSW" | "SUBB" | "SUBL" | "SUBW" | "SYSCALL" | "TESTB" | "TESTL" | "TESTW" | "VERR" | "VERW" | "WAIT" | "WORD" | "XCHGB" | "XCHGL" | - "XCHGW" | "XLAT" | "XORB" | "XORL" | "XORW" | "FMOVB" | "FMOVBP" | "FMOVD" | "FMOVDP" | "FMOVF" | "FMOVFP" | "FMOVL" | "FMOVLP" | "FMOVV" | - "FMOVVP" | "FMOVW" | "FMOVWP" | "FMOVX" | "FMOVXP" | "FCOMB" | "FCOMBP" | "FCOMD" | "FCOMDP" | "FCOMDPP" | "FCOMF" | "FCOMFP" | "FCOML" | - "FCOMLP" | "FCOMW" | "FCOMWP" | "FUCOM" | "FUCOMP" | "FUCOMPP" | "FADDDP" | "FADDW" | "FADDL" | "FADDF" | "FADDD" | "FMULDP" | "FMULW" | - "FMULL" | "FMULF" | "FMULD" | "FSUBDP" | "FSUBW" | "FSUBL" | "FSUBF" | "FSUBD" | "FSUBRDP" | "FSUBRW" | "FSUBRL" | "FSUBRF" | "FSUBRD" | - "FDIVDP" | "FDIVW" | "FDIVL" | "FDIVF" | "FDIVD" | "FDIVRDP" | "FDIVRW" | "FDIVRL" | "FDIVRF" | "FDIVRD" | "FXCHD" | "FFREE" | "FLDCW" | - "FLDENV" | "FRSTOR" | "FSAVE" | "FSTCW" | "FSTENV" | "FSTSW" | "F2XM1" | "FABS" | "FCHS" | "FCLEX" | "FCOS" | "FDECSTP" | "FINCSTP" | - "FINIT" | "FLD1" | "FLDL2E" | "FLDL2T" | "FLDLG2" | "FLDLN2" | "FLDPI" | "FLDZ" | "FNOP" | "FPATAN" | "FPREM" | "FPREM1" | "FPTAN" | - "FRNDINT" | "FSCALE" | "FSIN" | "FSINCOS" | "FSQRT" | "FTST" | "FXAM" | "FXTRACT" | "FYL2X" | "FYL2XP1" | "CMPXCHGB" | "CMPXCHGL" | - "CMPXCHGW" | "CMPXCHG8B" | "CPUID" | "INVD" | "INVLPG" | "LFENCE" | "MFENCE" | "MOVNTIL" | "RDMSR" | "RDPMC" | "RDTSC" | "RSM" | "SFENCE" | - "SYSRET" | "WBINVD" | "WRMSR" | "XADDB" | "XADDL" | "XADDW" | "CMOVLCC" | "CMOVLCS" | "CMOVLEQ" | "CMOVLGE" | "CMOVLGT" | "CMOVLHI" | - "CMOVLLE" | "CMOVLLS" | "CMOVLLT" | "CMOVLMI" | "CMOVLNE" | "CMOVLOC" | "CMOVLOS" | "CMOVLPC" | "CMOVLPL" | "CMOVLPS" | "CMOVQCC" | - "CMOVQCS" | "CMOVQEQ" | "CMOVQGE" | "CMOVQGT" | "CMOVQHI" | "CMOVQLE" | "CMOVQLS" | "CMOVQLT" | "CMOVQMI" | "CMOVQNE" | "CMOVQOC" | - "CMOVQOS" | "CMOVQPC" | "CMOVQPL" | "CMOVQPS" | "CMOVWCC" | "CMOVWCS" | "CMOVWEQ" | "CMOVWGE" | "CMOVWGT" | "CMOVWHI" | "CMOVWLE" | - "CMOVWLS" | "CMOVWLT" | "CMOVWMI" | "CMOVWNE" | "CMOVWOC" | "CMOVWOS" | "CMOVWPC" | "CMOVWPL" | "CMOVWPS" | "ADCQ" | "ADDQ" | "ANDQ" | - "BSFQ" | "BSRQ" | "BTCQ" | "BTQ" | "BTRQ" | "BTSQ" | "CMPQ" | "CMPSQ" | "CMPXCHGQ" | "CQO" | "DIVQ" | "IDIVQ" | "IMULQ" | "IRETQ" | "JCXZQ" - | "LEAQ" | "LEAVEQ" | "LODSQ" | "MOVQ" | "MOVLQSX" | "MOVLQZX" | "MOVNTIQ" | "MOVSQ" | "MULQ" | "NEGQ" | "NOTQ" | "ORQ" | "POPFQ" | "POPQ" | - "PUSHFQ" | "PUSHQ" | "RCLQ" | "RCRQ" | "ROLQ" | "RORQ" | "QUAD" | "SALQ" | "SARQ" | "SBBQ" | "SCASQ" | "SHLQ" | "SHRQ" | "STOSQ" | "SUBQ" | - "TESTQ" | "XADDQ" | "XCHGQ" | "XORQ" | "ADDPD" | "ADDPS" | "ADDSD" | "ADDSS" | "ANDNPD" | "ANDNPS" | "ANDPD" | "ANDPS" | "CMPPD" | "CMPPS" | - "CMPSD" | "CMPSS" | "COMISD" | "COMISS" | "CVTPD2PL" | "CVTPD2PS" | "CVTPL2PD" | "CVTPL2PS" | "CVTPS2PD" | "CVTPS2PL" | "CVTSD2SL" | - "CVTSD2SQ" | "CVTSD2SS" | "CVTSL2SD" | "CVTSL2SS" | "CVTSQ2SD" | "CVTSQ2SS" | "CVTSS2SD" | "CVTSS2SL" | "CVTSS2SQ" | "CVTTPD2PL" | - "CVTTPS2PL" | "CVTTSD2SL" | "CVTTSD2SQ" | "CVTTSS2SL" | "CVTTSS2SQ" | "DIVPD" | "DIVPS" | "DIVSD" | "DIVSS" | "EMMS" | "FXRSTOR" | - "FXRSTOR64" | "FXSAVE" | "FXSAVE64" | "LDMXCSR" | "MASKMOVOU" | "MASKMOVQ" | "MAXPD" | "MAXPS" | "MAXSD" | "MAXSS" | "MINPD" | "MINPS" | - "MINSD" | "MINSS" | "MOVAPD" | "MOVAPS" | "MOVOU" | "MOVHLPS" | "MOVHPD" | "MOVHPS" | "MOVLHPS" | "MOVLPD" | "MOVLPS" | "MOVMSKPD" | - "MOVMSKPS" | "MOVNTO" | "MOVNTPD" | "MOVNTPS" | "MOVNTQ" | "MOVO" | "MOVQOZX" | "MOVSD" | "MOVSS" | "MOVUPD" | "MOVUPS" | "MULPD" | "MULPS" - | "MULSD" | "MULSS" | "ORPD" | "ORPS" | "PACKSSLW" | "PACKSSWB" | "PACKUSWB" | "PADDB" | "PADDL" | "PADDQ" | "PADDSB" | "PADDSW" | "PADDUSB" - | "PADDUSW" | "PADDW" | "PANDB" | "PANDL" | "PANDSB" | "PANDSW" | "PANDUSB" | "PANDUSW" | "PANDW" | "PAND" | "PANDN" | "PAVGB" | "PAVGW" | - "PCMPEQB" | "PCMPEQL" | "PCMPEQW" | "PCMPGTB" | "PCMPGTL" | "PCMPGTW" | "PEXTRW" | "PFACC" | "PFADD" | "PFCMPEQ" | "PFCMPGE" | "PFCMPGT" | - "PFMAX" | "PFMIN" | "PFMUL" | "PFNACC" | "PFPNACC" | "PFRCP" | "PFRCPIT1" | "PFRCPI2T" | "PFRSQIT1" | "PFRSQRT" | "PFSUB" | "PFSUBR" | - "PINSRW" | "PINSRD" | "PINSRQ" | "PMADDWL" | "PMAXSW" | "PMAXUB" | "PMINSW" | "PMINUB" | "PMOVMSKB" | "PMULHRW" | "PMULHUW" | "PMULHW" | - "PMULLW" | "PMULULQ" | "POR" | "PSADBW" | "PSHUFHW" | "PSHUFL" | "PSHUFLW" | "PSHUFW" | "PSHUFB" | "PSLLO" | "PSLLL" | "PSLLQ" | "PSLLW" | - "PSRAL" | "PSRAW" | "PSRLO" | "PSRLL" | "PSRLQ" | "PSRLW" | "PSUBB" | "PSUBL" | "PSUBQ" | "PSUBSB" | "PSUBSW" | "PSUBUSB" | "PSUBUSW" | - "PSUBW" | "PSWAPL" | "PUNPCKHBW" | "PUNPCKHLQ" | "PUNPCKHQDQ" | "PUNPCKHWL" | "PUNPCKLBW" | "PUNPCKLLQ" | "PUNPCKLQDQ" | "PUNPCKLWL" | - "PXOR" | "RCPPS" | "RCPSS" | "RSQRTPS" | "RSQRTSS" | "SHUFPD" | "SHUFPS" | "SQRTPD" | "SQRTPS" | "SQRTSD" | "SQRTSS" | "STMXCSR" | "SUBPD" | - "SUBPS" | "SUBSD" | "SUBSS" | "UCOMISD" | "UCOMISS" | "UNPCKHPD" | "UNPCKHPS" | "UNPCKLPD" | "UNPCKLPS" | "XORPD" | "XORPS" | "PF2IW" | - "PF2IL" | "PI2FW" | "PI2FL" | "RETFW" | "RETFL" | "RETFQ" | "SWAPGS" | "MODE" | "CRC32B" | "CRC32Q" | "IMUL3Q" | "PREFETCHT0" | "PREFETCHT1" - | "PREFETCHT2" | "PREFETCHNTA" | "MOVQL" | "BSWAPL" | "BSWAPQ" | "AESENC" | "AESENCLAST" | "AESDEC" | "AESDECLAST" | "AESIMC" | - "AESKEYGENASSIST" | "ROUNDPS" | "ROUNDSS" | "ROUNDPD" | "ROUNDSD" | "PSHUFD" | "PCLMULQDQ" | "VZEROUPPER" | "MOVHDU" | "MOVNTHD" | "MOVHDA" - | "VPCMPEQB" | "VPXOR" | "VPMOVMSKB" | "VPAND" | "VPTEST" | "VPBROADCASTB" | "JCXZW" | "FCMOVCC" | "FCMOVCS" | "FCMOVEQ" | "FCMOVHI" | - "FCMOVLS" | "FCMOVNE" | "FCMOVNU" | "FCMOVUN" | "FCOMI" | "FCOMIP" | "FUCOMI" | "FUCOMIP" | "XACQUIRE" | "XRELEASE" | "XBEGIN" | "XEND" | - "XABORT" | "XTEST" | "LAST" - -FLAG = "NOPROF" | "DUPOK" | "NOSPLIT" | "RODATA" | "NOPTR" | "WRAPPER" | "NEEDCTXT" | "TLSBSS" | "NOFRAME" - -%% - -"#import" { return IMPORT; } -"TEXT" { return TEXT; } - -{FLAG} { return FLAG; } -{PSEUDO_REG} { return PSEUDO_REG; } -{INS} { return INSTRUCTION; } -{LINE_COMMENT} { return LINE_COMMENT; } -{WS} { return TokenType.WHITE_SPACE; } -{WSNL} { return TokenType.WHITE_SPACE; } -{LABEL} { return LABEL; } -":" { return COLON; } -"(" { return LPAREN; } -")" { return RPAREN; } -"," { return COMMA; } -"|" { return BIT_OR; } - -{NUM_HEX} { return HEX; } -{NUM_INT} { return INT; } - -{IDENT} { return IDENTIFIER; } - -{STR} [^\"]* {STR} { return STRING; } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Catch All -/////////////////////////////////////////////////////////////////////////////////////////////////// - -[^] { return com.intellij.psi.TokenType.BAD_CHARACTER; } \ No newline at end of file diff --git a/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelLexer.java b/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelLexer.java deleted file mode 100644 index 99583e1bfc..0000000000 --- a/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelLexer.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.lang.core.lexer; - -import com.intellij.lexer.FlexAdapter; - -public class AsmIntelLexer extends FlexAdapter { - public AsmIntelLexer() { - super(new _AsmIntelLexer()); - } -} diff --git a/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelTokenType.java b/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelTokenType.java deleted file mode 100644 index 0f7709f3d6..0000000000 --- a/plan9/src/com/plan9/intel/lang/core/lexer/AsmIntelTokenType.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan, Stuart Carnie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.lang.core.lexer; - -import com.plan9.intel.lang.AsmIntelLanguage; -import com.intellij.psi.tree.IElementType; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; - -public class AsmIntelTokenType extends IElementType { - public AsmIntelTokenType(@NotNull @NonNls String debugName) { - super(debugName, AsmIntelLanguage.INSTANCE); - } -} diff --git a/plan9/src/com/plan9/intel/lang/core/psi/AsmIntelElementType.java b/plan9/src/com/plan9/intel/lang/core/psi/AsmIntelElementType.java deleted file mode 100644 index f698f47913..0000000000 --- a/plan9/src/com/plan9/intel/lang/core/psi/AsmIntelElementType.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan, Stuart Carnie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.lang.core.psi; - -import com.plan9.intel.lang.AsmIntelLanguage; -import com.intellij.psi.tree.IElementType; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; - -public class AsmIntelElementType extends IElementType { - public AsmIntelElementType(@NotNull @NonNls String debugName) { - super(debugName, AsmIntelLanguage.INSTANCE); - } -} diff --git a/plan9/src/com/plan9/intel/lang/core/psi/AsmIntelFile.java b/plan9/src/com/plan9/intel/lang/core/psi/AsmIntelFile.java deleted file mode 100644 index 162d6eb4d7..0000000000 --- a/plan9/src/com/plan9/intel/lang/core/psi/AsmIntelFile.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.lang.core.psi; - -import com.intellij.extapi.psi.PsiFileBase; -import com.intellij.openapi.fileTypes.FileType; -import com.intellij.psi.FileViewProvider; -import com.plan9.intel.AsmIntelFileType; -import com.plan9.intel.lang.AsmIntelLanguage; -import org.jetbrains.annotations.NotNull; - -public class AsmIntelFile extends PsiFileBase { - public AsmIntelFile(@NotNull FileViewProvider viewProvider) { - super(viewProvider, AsmIntelLanguage.INSTANCE); - } - - @NotNull - @Override - public FileType getFileType() { - return AsmIntelFileType.INSTANCE; - } - - @Override - public String toString() { - return "x86 File"; - } -} diff --git a/plan9/src/com/plan9/intel/lang/core/psi/impl/AsmIntelElementImpl.java b/plan9/src/com/plan9/intel/lang/core/psi/impl/AsmIntelElementImpl.java deleted file mode 100644 index 15ab85462f..0000000000 --- a/plan9/src/com/plan9/intel/lang/core/psi/impl/AsmIntelElementImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan, Stuart Carnie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.lang.core.psi.impl; - -import com.intellij.extapi.psi.ASTWrapperPsiElement; -import com.intellij.lang.ASTNode; -import org.jetbrains.annotations.NotNull; - -public class AsmIntelElementImpl extends ASTWrapperPsiElement { - public AsmIntelElementImpl(@NotNull ASTNode node) { - super(node); - } - - @Override - public String toString() { - return getNode().getElementType().toString(); - } -} diff --git a/plan9/testData/intel/lexer/commentsAndWhitespace.s b/plan9/testData/intel/lexer/commentsAndWhitespace.s deleted file mode 100644 index 1e168ed673..0000000000 --- a/plan9/testData/intel/lexer/commentsAndWhitespace.s +++ /dev/null @@ -1,5 +0,0 @@ -// a comment line - -#import "a-file.h" - -// another comment line diff --git a/plan9/testData/intel/lexer/commentsAndWhitespace.txt b/plan9/testData/intel/lexer/commentsAndWhitespace.txt deleted file mode 100644 index 9bf6a814d7..0000000000 --- a/plan9/testData/intel/lexer/commentsAndWhitespace.txt +++ /dev/null @@ -1,7 +0,0 @@ -LINE_COMMENT ('// a comment line') -WHITE_SPACE ('\n\n') -import ('#import') -WHITE_SPACE (' ') -STRING ('"a-file.h"') -WHITE_SPACE ('\n\n') -LINE_COMMENT ('// another comment line') diff --git a/plan9/testData/intel/lexer/identifiers.s b/plan9/testData/intel/lexer/identifiers.s deleted file mode 100644 index bcac0cbd87..0000000000 --- a/plan9/testData/intel/lexer/identifiers.s +++ /dev/null @@ -1 +0,0 @@ -loop: diff --git a/plan9/testData/intel/lexer/identifiers.txt b/plan9/testData/intel/lexer/identifiers.txt deleted file mode 100644 index 6fa73f4213..0000000000 --- a/plan9/testData/intel/lexer/identifiers.txt +++ /dev/null @@ -1 +0,0 @@ -LABEL ('loop:') \ No newline at end of file diff --git a/plan9/testData/intel/lexer/simpleFile.s b/plan9/testData/intel/lexer/simpleFile.s deleted file mode 100644 index f8b000f339..0000000000 --- a/plan9/testData/intel/lexer/simpleFile.s +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// This input was created by taking the instruction productions in -// the old assembler's (6a's) grammar and hand-writing complete -// instructions for each rule, to guarantee we cover the same space. - -#import "a-file.h" - -TEXT foo(SB), 0, $0 - -// LTYPE1 nonrem { outcode($1, &$2); } - NEGQ R11 - NEGQ 4(R11) - NEGQ foo+4(SB) - -// LTYPE2 rimnon { outcode($1, &$2); } - INT $4 - DIVB R11 - DIVB 4(R11) - DIVB foo+4(SB) - -// LTYPE3 rimrem { outcode($1, &$2); } - SUBQ $4, DI - SUBQ R11, DI - SUBQ 4(R11), DI - SUBQ foo+4(SB), DI - SUBQ $4, 8(R12) - SUBQ R11, 8(R12) - SUBQ R11, foo+4(SB) - -// LTYPE4 remrim { outcode($1, &$2); } - CMPB CX, $4 - -// LTYPER nonrel { outcode($1, &$2); } -label: - JB -4(PC) - JB label - -// LTYPEC spec3 { outcode($1, &$2); } - JMP -4(PC) - JMP label - JMP foo+4(SB) - JMP bar<>+4(SB) - JMP bar<>+4(SB)(R11*4) - JMP *4(SP) - JMP *(R12) - JMP *(R12*4) - JMP *(R12)(R13*4) - JMP *(AX) - JMP *(SP) - JMP *(AX*4) - JMP *(AX)(AX*4) - JMP 4(SP) - JMP (R12) - JMP (R12*4) - JMP (R12)(R13*4) - JMP (AX) - JMP (SP) - JMP (AX*4) - JMP (AX)(AX*4) - JMP R13 - -// LTYPEN spec4 { outcode($1, &$2); } - NOP - NOP AX - NOP foo+4(SB) - -// LTYPES spec5 { outcode($1, &$2); } - SHLL R11, R12 - SHLL R11, foo+4(SB) - SHLL R11, R11:AX // Old syntax, still accepted. - -// LTYPEM spec6 { outcode($1, &$2); } - MOVL AX, R11 - MOVL $4, R11 - MOVL AX, AX:CS - -// LTYPEI spec7 { outcode($1, &$2); } - IMULB $4 - IMULB R11 - IMULB $4, R11 - IMULB R11, R12 - IMULB R11, foo+4(SB) - -// LTYPEXC spec8 { outcode($1, &$2); } - CMPPD R11, R12, 4 - CMPPD R11, foo+4(SB), 4 - -// LTYPEX spec9 { outcode($1, &$2); } - PINSRW $4, R11, AX - PINSRW $4, foo+4(SB), AX - -// LTYPERT spec10 { outcode($1, &$2); } - RETFL $4 - -// Was bug: LOOP is a branch instruction. -loop: - LOOP loop - -// LTYPE0 nonnon { outcode($1, &$2); } - RET diff --git a/plan9/testData/intel/lexer/simpleFile.txt b/plan9/testData/intel/lexer/simpleFile.txt deleted file mode 100644 index 72b2dbf746..0000000000 --- a/plan9/testData/intel/lexer/simpleFile.txt +++ /dev/null @@ -1,51 +0,0 @@ -var ('var') -GO_WHITESPACE (' ') -( ('(') -GO_WS_NEW_LINES ('\n') -GO_WHITESPACE (' ') -identifier ('ToBe') -GO_WHITESPACE (' ') -identifier ('bool') -GO_WHITESPACE (' ') -= ('=') -GO_WHITESPACE (' ') -identifier ('false') - ('') -GO_WS_NEW_LINES ('\n') -GO_WHITESPACE (' ') -identifier ('MaxInt') -GO_WHITESPACE (' ') -identifier ('uint64') -GO_WHITESPACE (' ') -= ('=') -GO_WHITESPACE (' ') -int ('1') -<< ('<<') -int ('64') -GO_WHITESPACE (' ') -- ('-') -GO_WHITESPACE (' ') -int ('1') - ('') -GO_WS_NEW_LINES ('\n') -GO_WHITESPACE (' ') -identifier ('z') -GO_WHITESPACE (' ') -identifier ('complex128') -GO_WHITESPACE (' ') -= ('=') -GO_WHITESPACE (' ') -identifier ('cmplx') -. ('.') -identifier ('Sqrt') -( ('(') -- ('-') -int ('5') -GO_WHITESPACE (' ') -+ ('+') -GO_WHITESPACE (' ') -decimali ('12i') -) (')') - ('') -GO_WS_NEW_LINES ('\n') -) (')') diff --git a/plan9/testData/intel/parser/SingleFunction.s b/plan9/testData/intel/parser/SingleFunction.s deleted file mode 100644 index 045776fff0..0000000000 --- a/plan9/testData/intel/parser/SingleFunction.s +++ /dev/null @@ -1,7 +0,0 @@ - -// foo() -TEXT foo(SB),(NOSPLIT|NOPROF) - -loop: - MOVL - diff --git a/plan9/testData/intel/parser/SingleFunction.txt b/plan9/testData/intel/parser/SingleFunction.txt deleted file mode 100644 index 4888f9c759..0000000000 --- a/plan9/testData/intel/parser/SingleFunction.txt +++ /dev/null @@ -1,23 +0,0 @@ -x86 File - PsiComment(LINE_COMMENT)('// foo()') - STATEMENT - FUNCTION - FUNCTION_HEADER - PsiElement(TEXT)('TEXT') - PsiElement(identifier)('foo') - PsiElement(()('(') - PsiElement(PSEUDO_REG)('SB') - PsiElement())(')') - PsiElement(,)(',') - FUNCTION_FLAGS - PsiElement(()('(') - PsiElement(FLAG)('NOSPLIT') - PsiElement(|)('|') - PsiElement(FLAG)('NOPROF') - PsiElement())(')') - FUNCTION_BODY - PsiElement(LABEL)('loop:') - INSTRUCTION_STMT - PsiElement(INSTRUCTION)('MOVL') - OPERANDS - \ No newline at end of file diff --git a/plan9/tests/com/plan9/intel/lang/core/lexer/AsmIntelLexerTest.java b/plan9/tests/com/plan9/intel/lang/core/lexer/AsmIntelLexerTest.java deleted file mode 100644 index 980f0eff88..0000000000 --- a/plan9/tests/com/plan9/intel/lang/core/lexer/AsmIntelLexerTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.lang.core.lexer; - -import com.intellij.lexer.Lexer; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.testFramework.LexerTestCase; - -import java.io.File; -import java.io.IOException; - -public class AsmIntelLexerTest extends LexerTestCase { - private static final String PATH = "testData/intel/lexer"; - - public void _testSimpleFile() { doTest(); } - public void testCommentsAndWhitespace() { doTest(); } - public void testIdentifiers() { doTest(); } - - private void doTest() { - try { - String text = FileUtil.loadFile(new File("./" + PATH + "/" + getTestName(true) + ".s")); - String actual = printTokens(StringUtil.convertLineSeparators(text.trim()), 0); - assertSameLinesWithFile(new File(PATH + "/" + getTestName(true) + ".txt").getAbsolutePath(), actual); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - protected Lexer createLexer() { - return new AsmIntelLexer(); - } - - @Override - protected String getDirPath() { - return "../" + PATH; - } -} \ No newline at end of file diff --git a/plan9/tests/com/plan9/intel/lang/core/parser/AsmIntelParserTest.java b/plan9/tests/com/plan9/intel/lang/core/parser/AsmIntelParserTest.java deleted file mode 100644 index c184022cd3..0000000000 --- a/plan9/tests/com/plan9/intel/lang/core/parser/AsmIntelParserTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.plan9.intel.lang.core.parser; - -import com.intellij.testFramework.ParsingTestCase; -import com.plan9.intel.lang.core.AsmIntelParserDefinition; -import org.jetbrains.annotations.NotNull; - -public class AsmIntelParserTest extends ParsingTestCase { - public AsmIntelParserTest() { - super("parser", "s", new AsmIntelParserDefinition()); - } - - @NotNull - @Override - protected String getTestDataPath() { - return "testData/intel"; - } - - @Override - protected boolean skipSpaces() { - return true; - } - - @Override - protected void doTest(boolean checkErrors) { - super.doTest(true); - if (checkErrors) { - assertFalse( - "PsiFile contains error elements", - toParseTreeText(myFile, skipSpaces(), includeRanges()).contains("PsiErrorElement") - ); - } - } - - public void testSingleFunction() { doTest(false); } -} diff --git a/pluginResources/META-INF/plugin.xml b/pluginResources/META-INF/plugin.xml deleted file mode 100644 index 692db98314..0000000000 --- a/pluginResources/META-INF/plugin.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - ro.redeul.google.go - Go language (golang.org) support plugin - 1.0 - - Custom Languages - - -
  • Navigation
  • -
      -
    • Go to inheritor structures
    • -
    • Go to super interfaces
    • -
    -
  • Type-aware completion (aka Smart completion)
  • -
  • Extract function refactoring
  • -
  • Implement type
  • -
  • Inspections and quick-fixes
  • -
      -
    • Introduce method
    • -
    • Introduce field
    • -
    • Delete unused parameter
    • -
    • Show symbol duplicates
    • -
    • Add/delete missing/redundant expressions in case of assignment count mismatch
    • -
    • Properly implemented Duplicated symbols inspection
    • -
    • Recursive type detection
    • -
    • Invalid const initialization
    • -
    -
  • Tests and coverage
  • -
      -
    • Sub-tests support (runner, navigation, gutter actions)
    • -
    • Debugging tests
    • -
    -
  • Debugger
  • -
      -
    • Step out
    • -
    • 100x faster performance
    • -
    -
  • General
  • -
      -
    • Highlighting of go:generate comments
    • -
    • Quick documentation for struct fields
    • -
    • Semantic highlighting
    • -
    • Parameter name hints
    • -
    • SQL auto-injection
    • -
    - - ]]>
    - - - - - - com.intellij.modules.lang - com.intellij.modules.java - com.intellij.modules.coverage - - - - - - - - - com.goide.UpdateComponent - - -
    diff --git a/settings.gradle b/settings.gradle index 86cf40c102..918eccf6b6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,3 @@ -rootProject.name = 'intellij-go' -include 'utils', 'google-app-engine', 'google-app-engine:google-app-engine-yaml', 'plan9' \ No newline at end of file +rootProject.name = 'golang-plugin' + +include 'google-app-engine', 'google-app-engine:google-app-engine-yaml', 'plan9' \ No newline at end of file diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAddExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAddExpr.java index 3282c66502..a84492981e 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAddExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAddExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAndExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAndExpr.java index 5031f40846..98e3362256 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAndExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAndExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAnonymousFieldDefinition.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAnonymousFieldDefinition.java index 158b95f3c0..d47e404d90 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAnonymousFieldDefinition.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAnonymousFieldDefinition.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoAnonymousFieldDefinitionStub; +import com.notzippy.intellij.go.stubs.GoAnonymousFieldDefinitionStub; import com.intellij.psi.ResolveState; public interface GoAnonymousFieldDefinition extends GoNamedElement, StubBasedPsiElement { @@ -39,6 +40,6 @@ public interface GoAnonymousFieldDefinition extends GoNamedElement, StubBasedPsi GoTypeReferenceExpression getTypeReferenceExpression(); @Nullable - GoType getGoTypeInner(ResolveState context); + GoType getGoTypeInner(@Nullable ResolveState context); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoArgumentList.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoArgumentList.java index 0c5b434525..25e6a27e1f 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoArgumentList.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoArgumentList.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoArrayOrSliceType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoArrayOrSliceType.java index b1bac53e07..197a1af5b4 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoArrayOrSliceType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoArrayOrSliceType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAssignOp.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAssignOp.java index 20e893c181..7e80fd2a0e 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAssignOp.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAssignOp.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAssignmentStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAssignmentStatement.java index 5fba8f0eb4..28611f494d 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAssignmentStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoAssignmentStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBinaryExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBinaryExpr.java index b1f4c8822b..b2706ecebb 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBinaryExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBinaryExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBlock.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBlock.java index d2e848f36e..117fc7b223 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBlock.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBlock.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; @@ -34,6 +35,6 @@ public interface GoBlock extends GoCompositeElement { @Nullable PsiElement getRbrace(); - boolean processDeclarations(PsiScopeProcessor processor, ResolveState state, PsiElement lastParent, PsiElement place); + boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBreakStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBreakStatement.java index f2139b25cc..e0aab9a4a6 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBreakStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBreakStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBuiltinArgumentList.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBuiltinArgumentList.java index 6b9fde20c5..0e1c84aa36 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBuiltinArgumentList.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBuiltinArgumentList.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBuiltinCallExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBuiltinCallExpr.java index f7f142649f..a933a988f0 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBuiltinCallExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoBuiltinCallExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCallExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCallExpr.java index 46c25704be..92eea737a9 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCallExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCallExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoChannelType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoChannelType.java index f6bfceee7f..8c15578aa4 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoChannelType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoChannelType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCommCase.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCommCase.java index 007327e704..fb83c97590 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCommCase.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCommCase.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCommClause.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCommClause.java index 90fb601922..10d39a0fb4 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCommClause.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCommClause.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCompositeLit.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCompositeLit.java index 5b5cd843bb..8c24708f9b 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCompositeLit.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoCompositeLit.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConditionalExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConditionalExpr.java index db6093120a..3bab813a5e 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConditionalExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConditionalExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConstDeclaration.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConstDeclaration.java index c6c88a45ae..253a2728c1 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConstDeclaration.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConstDeclaration.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; @@ -36,8 +37,8 @@ public interface GoConstDeclaration extends GoTopLevelDeclaration { PsiElement getConst(); @NotNull - GoConstSpec addSpec(String name, String type, String value, GoConstSpec specAnchor); + GoConstSpec addSpec(@NotNull String name, @Nullable String type, @Nullable String value, @Nullable GoConstSpec specAnchor); - void deleteSpec(GoConstSpec specToDelete); + void deleteSpec(@NotNull GoConstSpec specToDelete); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConstDefinition.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConstDefinition.java index 269e6ec8b8..7a48a6948a 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConstDefinition.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoConstDefinition.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoConstDefinitionStub; +import com.notzippy.intellij.go.stubs.GoConstDefinitionStub; import com.intellij.psi.ResolveState; public interface GoConstDefinition extends GoNamedElement, StubBasedPsiElement { @@ -30,7 +31,7 @@ public interface GoConstDefinition extends GoNamedElement, StubBasedPsiElement { @@ -37,6 +38,6 @@ public interface GoConstSpec extends GoCompositeElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFieldName.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFieldName.java index 7c49ddd740..e976961db1 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFieldName.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFieldName.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoForClause.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoForClause.java index 6595851753..f6c9203e13 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoForClause.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoForClause.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; @@ -31,6 +32,6 @@ public interface GoForClause extends GoCompositeElement { @NotNull List getStatementList(); - boolean processDeclarations(PsiScopeProcessor processor, ResolveState state, PsiElement lastParent, PsiElement place); + boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoForStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoForStatement.java index 84802712fa..8cc7622e74 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoForStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoForStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionDeclaration.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionDeclaration.java index c90fb0780f..019a076f83 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionDeclaration.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionDeclaration.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoFunctionDeclarationStub; +import com.notzippy.intellij.go.stubs.GoFunctionDeclarationStub; public interface GoFunctionDeclaration extends GoFunctionOrMethodDeclaration, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionLit.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionLit.java index 41c822c842..2bfb8b6363 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionLit.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionLit.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; @@ -34,6 +35,6 @@ public interface GoFunctionLit extends GoExpression, GoSignatureOwner { @NotNull PsiElement getFunc(); - boolean processDeclarations(PsiScopeProcessor processor, ResolveState state, PsiElement lastParent, PsiElement place); + boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionType.java index ef50a91964..c575c979ac 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoFunctionType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoGoStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoGoStatement.java index a57586e498..4733c8a050 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoGoStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoGoStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoGotoStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoGotoStatement.java index c9dcdcc2be..50cf7e6019 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoGotoStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoGotoStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIfStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIfStatement.java index 20b0ec5a0e..d46ab85eab 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIfStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIfStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportDeclaration.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportDeclaration.java index 1e0a9126cd..70a976e8b5 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportDeclaration.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportDeclaration.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; @@ -36,6 +37,6 @@ public interface GoImportDeclaration extends GoCompositeElement { PsiElement getImport(); @NotNull - GoImportSpec addImportSpec(String packagePath, String alias); + GoImportSpec addImportSpec(@NotNull String packagePath, @Nullable String alias); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportList.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportList.java index 96cb301e93..8190f348f0 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportList.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportList.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; @@ -27,6 +28,6 @@ public interface GoImportList extends GoCompositeElement { List getImportDeclarationList(); @NotNull - GoImportSpec addImport(String packagePath, String alias); + GoImportSpec addImport(@NotNull String packagePath, @Nullable String alias); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportSpec.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportSpec.java index 7b9d9411dd..dd2d473eb7 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportSpec.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportSpec.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoImportSpecStub; +import com.notzippy.intellij.go.stubs.GoImportSpecStub; public interface GoImportSpec extends GoNamedElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportString.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportString.java index a460491965..19e864f7e5 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportString.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoImportString.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIncDecStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIncDecStatement.java index 57ce489166..2a78998815 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIncDecStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIncDecStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIndexOrSliceExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIndexOrSliceExpr.java index 12e249da06..274c2e3b89 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIndexOrSliceExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoIndexOrSliceExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoInterfaceType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoInterfaceType.java index 84766a5a09..bcbc668637 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoInterfaceType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoInterfaceType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoKey.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoKey.java index 510a289c53..8fa90118be 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoKey.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoKey.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabelDefinition.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabelDefinition.java index 97dafd0096..981084013a 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabelDefinition.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabelDefinition.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoLabelDefinitionStub; +import com.notzippy.intellij.go.stubs.GoLabelDefinitionStub; public interface GoLabelDefinition extends GoNamedElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabelRef.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabelRef.java index 9ca82b6217..a5a6838a15 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabelRef.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabelRef.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabeledStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabeledStatement.java index 70fc078797..248748d786 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabeledStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLabeledStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLeftHandExprList.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLeftHandExprList.java index 06b627b488..74f5fb4dfe 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLeftHandExprList.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLeftHandExprList.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteral.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteral.java index 74c181db01..d756feaa29 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteral.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteral.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteralTypeExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteralTypeExpr.java index 2c61d65d5a..01fd59d525 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteralTypeExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteralTypeExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteralValue.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteralValue.java index f6b03a2d8f..9d788b3c4e 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteralValue.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoLiteralValue.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMapType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMapType.java index c74c5a9abe..cc080f73d8 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMapType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMapType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMethodDeclaration.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMethodDeclaration.java index 190ffe54b5..1ffc0d6cbd 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMethodDeclaration.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMethodDeclaration.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoMethodDeclarationStub; +import com.notzippy.intellij.go.stubs.GoMethodDeclarationStub; public interface GoMethodDeclaration extends GoFunctionOrMethodDeclaration, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMethodSpec.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMethodSpec.java index 194433cb0a..1b744b3225 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMethodSpec.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMethodSpec.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoMethodSpecStub; +import com.notzippy.intellij.go.stubs.GoMethodSpecStub; import com.intellij.psi.ResolveState; public interface GoMethodSpec extends GoNamedSignatureOwner, StubBasedPsiElement { @@ -36,7 +37,7 @@ public interface GoMethodSpec extends GoNamedSignatureOwner, StubBasedPsiElement PsiElement getIdentifier(); @Nullable - GoType getGoTypeInner(ResolveState context); + GoType getGoTypeInner(@Nullable ResolveState context); @Nullable String getName(); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMulExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMulExpr.java index a648e6b1a1..a6dcc9372d 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMulExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoMulExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoOrExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoOrExpr.java index d1cbfcaff4..53ef234cdf 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoOrExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoOrExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoPackageClause.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoPackageClause.java index 4483569d5f..335b3dbd06 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoPackageClause.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoPackageClause.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoPackageClauseStub; +import com.notzippy.intellij.go.stubs.GoPackageClauseStub; public interface GoPackageClause extends GoCompositeElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParType.java index 16da393118..bf9bb9b391 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParamDefinition.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParamDefinition.java index c4aa9a5673..e9561344aa 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParamDefinition.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParamDefinition.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoParamDefinitionStub; +import com.notzippy.intellij.go.stubs.GoParamDefinitionStub; public interface GoParamDefinition extends GoNamedElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParameterDeclaration.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParameterDeclaration.java index 26fa084c97..9aacbfb483 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParameterDeclaration.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParameterDeclaration.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoParameterDeclarationStub; +import com.notzippy.intellij.go.stubs.GoParameterDeclarationStub; public interface GoParameterDeclaration extends GoCompositeElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParameters.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParameters.java index 8c35023798..c2411389cb 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParameters.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParameters.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoParametersStub; +import com.notzippy.intellij.go.stubs.GoParametersStub; public interface GoParameters extends GoCompositeElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParenthesesExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParenthesesExpr.java index bfd5923b9c..9809cd8866 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParenthesesExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoParenthesesExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoPointerType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoPointerType.java index 79cde56cef..418d665e65 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoPointerType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoPointerType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoRangeClause.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoRangeClause.java index 304ad8f223..42c19c532d 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoRangeClause.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoRangeClause.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoReceiver.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoReceiver.java index d9b77a90af..42cbf42280 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoReceiver.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoReceiver.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoReceiverStub; +import com.notzippy.intellij.go.stubs.GoReceiverStub; import com.intellij.psi.ResolveState; public interface GoReceiver extends GoNamedElement, StubBasedPsiElement { @@ -42,6 +43,6 @@ public interface GoReceiver extends GoNamedElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoReturnStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoReturnStatement.java index 70ddb6d76d..744e04faa0 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoReturnStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoReturnStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSelectStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSelectStatement.java index dfd7093aad..099d96e635 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSelectStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSelectStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSelectorExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSelectorExpr.java index 2660b3e9ab..c42df7fdff 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSelectorExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSelectorExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSendStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSendStatement.java index 6db11e3ca9..5f9fa77c0d 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSendStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSendStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoShortVarDeclaration.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoShortVarDeclaration.java index e4e09762aa..fd012bf0e9 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoShortVarDeclaration.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoShortVarDeclaration.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSignature.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSignature.java index 47df48f3dc..4ed60f03ef 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSignature.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSignature.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoSignatureStub; +import com.notzippy.intellij.go.stubs.GoSignatureStub; public interface GoSignature extends GoCompositeElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSimpleStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSimpleStatement.java index ac01a730bb..14bcf87832 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSimpleStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSimpleStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSpecType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSpecType.java index e7878655dc..2b722291bd 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSpecType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSpecType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.stubs.GoTypeStub; public interface GoSpecType extends GoType, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStatement.java index 0aa5791ccf..7b90039cd8 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; @@ -37,6 +38,6 @@ public interface GoStatement extends GoCompositeElement { @Nullable GoVarDeclaration getVarDeclaration(); - boolean processDeclarations(PsiScopeProcessor processor, ResolveState state, PsiElement lastParent, PsiElement place); + boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStringLiteral.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStringLiteral.java index ad50bbf021..6015d16101 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStringLiteral.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStringLiteral.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,14 +16,14 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLanguageInjectionHost; -import com.goide.psi.impl.GoStringLiteralImpl; -import com.goide.util.GoStringLiteralEscaper; +import com.notzippy.intellij.go.grammar.psi.impl.GoStringLiteralImpl; +import com.notzippy.intellij.go.parser.GoStringLiteralEscaper; public interface GoStringLiteral extends GoExpression, PsiLanguageInjectionHost { @@ -35,7 +36,7 @@ public interface GoStringLiteral extends GoExpression, PsiLanguageInjectionHost boolean isValidHost(); @NotNull - GoStringLiteralImpl updateText(String text); + GoStringLiteralImpl updateText(@NotNull String text); @NotNull GoStringLiteralEscaper createLiteralTextEscaper(); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStructType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStructType.java index 7b67143916..3af085315f 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStructType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoStructType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSwitchStart.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSwitchStart.java index fd05b4f27c..17c4962019 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSwitchStart.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSwitchStart.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSwitchStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSwitchStatement.java index 5907865171..392f361987 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSwitchStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoSwitchStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTag.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTag.java index d8b3cc67ba..f4f33f9b06 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTag.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTag.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoType.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoType.java index 0c2a2f4c19..8667ba1c85 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoType.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoType.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.stubs.GoTypeStub; public interface GoType extends GoCompositeElement, StubBasedPsiElement { diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeAssertionExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeAssertionExpr.java index dc8a86c08c..aab1fde806 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeAssertionExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeAssertionExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeCaseClause.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeCaseClause.java index bb12383913..108895f08e 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeCaseClause.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeCaseClause.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeDeclaration.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeDeclaration.java index 9fccdd2575..8a828564e2 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeDeclaration.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeDeclaration.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeGuard.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeGuard.java index 4168337b1f..4e81169032 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeGuard.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeGuard.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeList.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeList.java index ad23e5968b..4c0654d287 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeList.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeList.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeReferenceExpression.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeReferenceExpression.java index 4503bba411..6740bce88a 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeReferenceExpression.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeReferenceExpression.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSpec.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSpec.java index 95b347a855..bb1a582a29 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSpec.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSpec.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoTypeSpecStub; +import com.notzippy.intellij.go.stubs.GoTypeSpecStub; import com.intellij.psi.ResolveState; public interface GoTypeSpec extends GoNamedElement, StubBasedPsiElement { @@ -30,7 +31,7 @@ public interface GoTypeSpec extends GoNamedElement, StubBasedPsiElement getMethods(); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSwitchGuard.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSwitchGuard.java index ddb3d60a8c..0b9f1498ab 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSwitchGuard.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSwitchGuard.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSwitchStatement.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSwitchStatement.java index 46409e3c39..17de991d08 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSwitchStatement.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoTypeSwitchStatement.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoUnaryExpr.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoUnaryExpr.java index 3d84826e1f..25b2e07c54 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoUnaryExpr.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoUnaryExpr.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoValue.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoValue.java index e9b8916f13..e4010343d4 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoValue.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoValue.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVarDeclaration.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVarDeclaration.java index e18a6206bc..6e59e3fff7 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVarDeclaration.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVarDeclaration.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; @@ -36,8 +37,8 @@ public interface GoVarDeclaration extends GoTopLevelDeclaration { PsiElement getVar(); @NotNull - GoVarSpec addSpec(String name, String type, String value, GoVarSpec specAnchor); + GoVarSpec addSpec(@NotNull String name, @Nullable String type, @Nullable String value, @Nullable GoVarSpec specAnchor); - void deleteSpec(GoVarSpec specToDelete); + void deleteSpec(@NotNull GoVarSpec specToDelete); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVarDefinition.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVarDefinition.java index 24b304cfa3..299cf000bd 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVarDefinition.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVarDefinition.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,13 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElement; import com.intellij.psi.StubBasedPsiElement; -import com.goide.stubs.GoVarDefinitionStub; +import com.notzippy.intellij.go.stubs.GoVarDefinitionStub; import com.intellij.psi.PsiReference; import com.intellij.psi.ResolveState; @@ -31,7 +32,7 @@ public interface GoVarDefinition extends GoNamedElement, StubBasedPsiElement getRightExpressionsList(); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVisitor.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVisitor.java index ee6d6ae6bf..ed618704c6 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVisitor.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/GoVisitor.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +16,7 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import org.jetbrains.annotations.*; import com.intellij.psi.PsiElementVisitor; diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAddExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAddExprImpl.java index 933f14bd67..e4c7d152c8 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAddExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAddExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoAddExprImpl extends GoBinaryExprImpl implements GoAddExpr { - public GoAddExprImpl(ASTNode node) { + public GoAddExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAndExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAndExprImpl.java index 338c7e46be..e718f392b8 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAndExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAndExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoAndExprImpl extends GoBinaryExprImpl implements GoAndExpr { - public GoAndExprImpl(ASTNode node) { + public GoAndExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAnonymousFieldDefinitionImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAnonymousFieldDefinitionImpl.java index 3c71eab91e..c079eb9e45 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAnonymousFieldDefinitionImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAnonymousFieldDefinitionImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,27 +16,27 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoAnonymousFieldDefinitionStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoAnonymousFieldDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.stubs.IStubElementType; public class GoAnonymousFieldDefinitionImpl extends GoNamedElementImpl implements GoAnonymousFieldDefinition { - public GoAnonymousFieldDefinitionImpl(GoAnonymousFieldDefinitionStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoAnonymousFieldDefinitionImpl(@NotNull GoAnonymousFieldDefinitionStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoAnonymousFieldDefinitionImpl(ASTNode node) { + public GoAnonymousFieldDefinitionImpl(@NotNull ASTNode node) { super(node); } @@ -54,23 +55,27 @@ public GoType getType() { return notNullChild(GoPsiTreeUtil.getStubChildOfType(this, GoType.class)); } + @Override @Nullable public PsiElement getIdentifier() { return GoPsiImplUtil.getIdentifier(this); } + @Override @Nullable public String getName() { return GoPsiImplUtil.getName(this); } + @Override @Nullable public GoTypeReferenceExpression getTypeReferenceExpression() { return GoPsiImplUtil.getTypeReferenceExpression(this); } + @Override @Nullable - public GoType getGoTypeInner(ResolveState context) { + public GoType getGoTypeInner(@Nullable ResolveState context) { return GoPsiImplUtil.getGoTypeInner(this, context); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoArgumentListImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoArgumentListImpl.java index 8b9006708a..d0f733139d 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoArgumentListImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoArgumentListImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoArgumentListImpl extends GoCompositeElementImpl implements GoArgumentList { - public GoArgumentListImpl(ASTNode node) { + public GoArgumentListImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoArrayOrSliceTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoArrayOrSliceTypeImpl.java index efd17c6470..7f03dd1aca 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoArrayOrSliceTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoArrayOrSliceTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoTypeStub; public class GoArrayOrSliceTypeImpl extends GoTypeImpl implements GoArrayOrSliceType { - public GoArrayOrSliceTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoArrayOrSliceTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoArrayOrSliceTypeImpl(ASTNode node) { + public GoArrayOrSliceTypeImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAssignOpImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAssignOpImpl.java index 9b0f51daca..6f8ae51745 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAssignOpImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAssignOpImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoAssignOpImpl extends GoCompositeElementImpl implements GoAssignOp { - public GoAssignOpImpl(ASTNode node) { + public GoAssignOpImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAssignmentStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAssignmentStatementImpl.java index 2fa951c629..dbcebb2fa4 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAssignmentStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoAssignmentStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoAssignmentStatementImpl extends GoStatementImpl implements GoAssignmentStatement { - public GoAssignmentStatementImpl(ASTNode node) { + public GoAssignmentStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBinaryExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBinaryExprImpl.java index 5c4bfb95f5..265baf102a 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBinaryExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBinaryExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoBinaryExprImpl extends GoExpressionImpl implements GoBinaryExpr { - public GoBinaryExprImpl(ASTNode node) { + public GoBinaryExprImpl(@NotNull ASTNode node) { super(node); } @@ -61,6 +62,7 @@ public GoExpression getRight() { return p1.size() < 2 ? null : p1.get(1); } + @Override @Nullable public PsiElement getOperator() { return GoPsiImplUtil.getOperator(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBlockImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBlockImpl.java index 8f793cfbb6..09462b1ffe 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBlockImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBlockImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,22 +16,22 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.scope.PsiScopeProcessor; public class GoBlockImpl extends GoCompositeElementImpl implements GoBlock { - public GoBlockImpl(ASTNode node) { + public GoBlockImpl(@NotNull ASTNode node) { super(node); } @@ -61,7 +62,8 @@ public PsiElement getRbrace() { return findChildByType(RBRACE); } - public boolean processDeclarations(PsiScopeProcessor processor, ResolveState state, PsiElement lastParent, PsiElement place) { + @Override + public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place) { return GoPsiImplUtil.processDeclarations(this, processor, state, lastParent, place); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBreakStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBreakStatementImpl.java index 826bed4dfa..48a9399b4f 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBreakStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBreakStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoBreakStatementImpl extends GoStatementImpl implements GoBreakStatement { - public GoBreakStatementImpl(ASTNode node) { + public GoBreakStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBuiltinArgumentListImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBuiltinArgumentListImpl.java index 9a55fde64a..e17035086b 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBuiltinArgumentListImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBuiltinArgumentListImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoBuiltinArgumentListImpl extends GoArgumentListImpl implements GoBuiltinArgumentList { - public GoBuiltinArgumentListImpl(ASTNode node) { + public GoBuiltinArgumentListImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBuiltinCallExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBuiltinCallExprImpl.java index 2d2ab4283b..05cbe95ff4 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBuiltinCallExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoBuiltinCallExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoBuiltinCallExprImpl extends GoExpressionImpl implements GoBuiltinCallExpr { - public GoBuiltinCallExprImpl(ASTNode node) { + public GoBuiltinCallExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCallExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCallExprImpl.java index 8bd81a04d1..4ab0de4e70 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCallExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCallExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoCallExprImpl extends GoExpressionImpl implements GoCallExpr { - public GoCallExprImpl(ASTNode node) { + public GoCallExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoChannelTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoChannelTypeImpl.java index 3ce5e57988..e5c0a0abbf 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoChannelTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoChannelTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoTypeStub; public class GoChannelTypeImpl extends GoTypeImpl implements GoChannelType { - public GoChannelTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoChannelTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoChannelTypeImpl(ASTNode node) { + public GoChannelTypeImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCommCaseImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCommCaseImpl.java index d9da8699d7..6dde5b55fb 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCommCaseImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCommCaseImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoCommCaseImpl extends GoCompositeElementImpl implements GoCommCase { - public GoCommCaseImpl(ASTNode node) { + public GoCommCaseImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCommClauseImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCommClauseImpl.java index a890ed2255..f2b70a151b 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCommClauseImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCommClauseImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoCommClauseImpl extends GoCompositeElementImpl implements GoCommClause { - public GoCommClauseImpl(ASTNode node) { + public GoCommClauseImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCompositeLitImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCompositeLitImpl.java index c4f1da9bb5..d72cc7afb3 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCompositeLitImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoCompositeLitImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoCompositeLitImpl extends GoExpressionImpl implements GoCompositeLit { - public GoCompositeLitImpl(ASTNode node) { + public GoCompositeLitImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConditionalExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConditionalExprImpl.java index 7da2163c1e..7abed992e7 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConditionalExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConditionalExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoConditionalExprImpl extends GoBinaryExprImpl implements GoConditionalExpr { - public GoConditionalExprImpl(ASTNode node) { + public GoConditionalExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstDeclarationImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstDeclarationImpl.java index 19ac329d1e..02cdfcd204 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstDeclarationImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstDeclarationImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoConstDeclarationImpl extends GoCompositeElementImpl implements GoConstDeclaration { - public GoConstDeclarationImpl(ASTNode node) { + public GoConstDeclarationImpl(@NotNull ASTNode node) { super(node); } @@ -65,12 +66,14 @@ public PsiElement getConst() { return notNullChild(findChildByType(CONST)); } + @Override @NotNull - public GoConstSpec addSpec(String name, String type, String value, GoConstSpec specAnchor) { + public GoConstSpec addSpec(@NotNull String name, @Nullable String type, @Nullable String value, @Nullable GoConstSpec specAnchor) { return GoPsiImplUtil.addSpec(this, name, type, value, specAnchor); } - public void deleteSpec(GoConstSpec specToDelete) { + @Override + public void deleteSpec(@NotNull GoConstSpec specToDelete) { GoPsiImplUtil.deleteSpec(this, specToDelete); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstDefinitionImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstDefinitionImpl.java index b45fe74a9a..0217206024 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstDefinitionImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstDefinitionImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,27 +16,27 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoConstDefinitionStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoConstDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.stubs.IStubElementType; public class GoConstDefinitionImpl extends GoNamedElementImpl implements GoConstDefinition { - public GoConstDefinitionImpl(GoConstDefinitionStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoConstDefinitionImpl(@NotNull GoConstDefinitionStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoConstDefinitionImpl(ASTNode node) { + public GoConstDefinitionImpl(@NotNull ASTNode node) { super(node); } @@ -54,11 +55,13 @@ public PsiElement getIdentifier() { return notNullChild(findChildByType(IDENTIFIER)); } + @Override @Nullable - public GoType getGoTypeInner(ResolveState context) { + public GoType getGoTypeInner(@Nullable ResolveState context) { return GoPsiImplUtil.getGoTypeInner(this, context); } + @Override @Nullable public GoExpression getValue() { return GoPsiImplUtil.getValue(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstSpecImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstSpecImpl.java index 2a65c79a59..da36da5c13 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstSpecImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConstSpecImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoConstSpecStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoConstSpecStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoConstSpecImpl extends GoStubbedElementImpl implements GoConstSpec { - public GoConstSpecImpl(GoConstSpecStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoConstSpecImpl(@NotNull GoConstSpecStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoConstSpecImpl(ASTNode node) { + public GoConstSpecImpl(@NotNull ASTNode node) { super(node); } @@ -71,7 +72,8 @@ public PsiElement getAssign() { return findChildByType(ASSIGN); } - public void deleteDefinition(GoConstDefinition definitionToDelete) { + @Override + public void deleteDefinition(@NotNull GoConstDefinition definitionToDelete) { GoPsiImplUtil.deleteDefinition(this, definitionToDelete); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoContinueStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoContinueStatementImpl.java index a1012d2aa8..7432dc90ed 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoContinueStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoContinueStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoContinueStatementImpl extends GoStatementImpl implements GoContinueStatement { - public GoContinueStatementImpl(ASTNode node) { + public GoContinueStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConversionExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConversionExprImpl.java index ee1b7afc92..3c1773530d 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConversionExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoConversionExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoConversionExprImpl extends GoBinaryExprImpl implements GoConversionExpr { - public GoConversionExprImpl(ASTNode node) { + public GoConversionExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoDeferStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoDeferStatementImpl.java index 82a49a2ce8..2b67c5e34e 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoDeferStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoDeferStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoDeferStatementImpl extends GoStatementImpl implements GoDeferStatement { - public GoDeferStatementImpl(ASTNode node) { + public GoDeferStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoElementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoElementImpl.java index 6f0cc5d732..fd36f4996a 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoElementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoElementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoElementImpl extends GoCompositeElementImpl implements GoElement { - public GoElementImpl(ASTNode node) { + public GoElementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoElseStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoElseStatementImpl.java index 9d23f97445..92704887d4 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoElseStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoElseStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoElseStatementImpl extends GoStatementImpl implements GoElseStatement { - public GoElseStatementImpl(ASTNode node) { + public GoElseStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExprCaseClauseImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExprCaseClauseImpl.java index 204577351a..d8cb1fe83e 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExprCaseClauseImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExprCaseClauseImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoExprCaseClauseImpl extends GoCompositeElementImpl implements GoExprCaseClause { - public GoExprCaseClauseImpl(ASTNode node) { + public GoExprCaseClauseImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExprSwitchStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExprSwitchStatementImpl.java index e7c640a56f..8b56488ac3 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExprSwitchStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExprSwitchStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoExprSwitchStatementImpl extends GoSwitchStatementImpl implements GoExprSwitchStatement { - public GoExprSwitchStatementImpl(ASTNode node) { + public GoExprSwitchStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExpressionImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExpressionImpl.java index c6339d6c18..99223893c7 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExpressionImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoExpressionImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,21 +16,21 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; -public class GoExpressionImpl extends GoCompositeElementImpl implements GoExpression { +public abstract class GoExpressionImpl extends GoCompositeElementImpl implements GoExpression { - public GoExpressionImpl(ASTNode node) { + public GoExpressionImpl(@NotNull ASTNode node) { super(node); } @@ -42,8 +43,9 @@ public void accept(@NotNull PsiElementVisitor visitor) { else super.accept(visitor); } + @Override @Nullable - public GoType getGoType(ResolveState context) { + public GoType getGoType(@Nullable ResolveState context) { return GoPsiImplUtil.getGoType(this, context); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFallthroughStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFallthroughStatementImpl.java index 5abac92f3d..628118efea 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFallthroughStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFallthroughStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoFallthroughStatementImpl extends GoStatementImpl implements GoFallthroughStatement { - public GoFallthroughStatementImpl(ASTNode node) { + public GoFallthroughStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldDeclarationImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldDeclarationImpl.java index 2bedf6b66b..51902c9245 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldDeclarationImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldDeclarationImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoFieldDeclarationImpl extends GoCompositeElementImpl implements GoFieldDeclaration { - public GoFieldDeclarationImpl(ASTNode node) { + public GoFieldDeclarationImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldDefinitionImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldDefinitionImpl.java index 9eae4dc745..ec144e22b9 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldDefinitionImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldDefinitionImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoFieldDefinitionStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoFieldDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoFieldDefinitionImpl extends GoNamedElementImpl implements GoFieldDefinition { - public GoFieldDefinitionImpl(GoFieldDefinitionStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoFieldDefinitionImpl(@NotNull GoFieldDefinitionStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoFieldDefinitionImpl(ASTNode node) { + public GoFieldDefinitionImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldNameImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldNameImpl.java index b0480c6e76..5f64226bc0 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldNameImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFieldNameImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,21 +16,21 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.PsiReference; public class GoFieldNameImpl extends GoCompositeElementImpl implements GoFieldName { - public GoFieldNameImpl(ASTNode node) { + public GoFieldNameImpl(@NotNull ASTNode node) { super(node); } @@ -48,16 +49,19 @@ public PsiElement getIdentifier() { return notNullChild(findChildByType(IDENTIFIER)); } + @Override @NotNull public PsiReference getReference() { return GoPsiImplUtil.getReference(this); } + @Override @Nullable public GoReferenceExpression getQualifier() { return GoPsiImplUtil.getQualifier(this); } + @Override @Nullable public PsiElement resolve() { return GoPsiImplUtil.resolve(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoForClauseImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoForClauseImpl.java index f0fb98b93f..97edfb6eb6 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoForClauseImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoForClauseImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,22 +16,22 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.scope.PsiScopeProcessor; public class GoForClauseImpl extends GoCompositeElementImpl implements GoForClause { - public GoForClauseImpl(ASTNode node) { + public GoForClauseImpl(@NotNull ASTNode node) { super(node); } @@ -55,7 +56,8 @@ public List getStatementList() { return GoPsiTreeUtil.getChildrenOfTypeAsList(this, GoStatement.class); } - public boolean processDeclarations(PsiScopeProcessor processor, ResolveState state, PsiElement lastParent, PsiElement place) { + @Override + public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place) { return GoPsiImplUtil.processDeclarations(this, processor, state, lastParent, place); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoForStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoForStatementImpl.java index 5c128d9387..6da37e4a80 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoForStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoForStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoForStatementImpl extends GoStatementImpl implements GoForStatement { - public GoForStatementImpl(ASTNode node) { + public GoForStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionDeclarationImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionDeclarationImpl.java index 99424000cd..e4a21e93fd 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionDeclarationImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionDeclarationImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoFunctionDeclarationStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoFunctionDeclarationStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoFunctionDeclarationImpl extends GoFunctionOrMethodDeclarationImpl implements GoFunctionDeclaration { - public GoFunctionDeclarationImpl(GoFunctionDeclarationStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoFunctionDeclarationImpl(@NotNull GoFunctionDeclarationStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoFunctionDeclarationImpl(ASTNode node) { + public GoFunctionDeclarationImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionLitImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionLitImpl.java index 9c0852c77f..bb4ac36c7a 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionLitImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionLitImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,22 +16,22 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.scope.PsiScopeProcessor; public class GoFunctionLitImpl extends GoExpressionImpl implements GoFunctionLit { - public GoFunctionLitImpl(ASTNode node) { + public GoFunctionLitImpl(@NotNull ASTNode node) { super(node); } @@ -61,7 +62,8 @@ public PsiElement getFunc() { return notNullChild(findChildByType(FUNC)); } - public boolean processDeclarations(PsiScopeProcessor processor, ResolveState state, PsiElement lastParent, PsiElement place) { + @Override + public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place) { return GoPsiImplUtil.processDeclarations(this, processor, state, lastParent, place); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionTypeImpl.java index 99d7eb6013..b80ffef551 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoTypeStub; public class GoFunctionTypeImpl extends GoTypeImpl implements GoFunctionType { - public GoFunctionTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoFunctionTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoFunctionTypeImpl(ASTNode node) { + public GoFunctionTypeImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoGoStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoGoStatementImpl.java index 19dfe473ad..39e6ee58bc 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoGoStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoGoStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoGoStatementImpl extends GoStatementImpl implements GoGoStatement { - public GoGoStatementImpl(ASTNode node) { + public GoGoStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoGotoStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoGotoStatementImpl.java index ae8b01ee5e..3f6bad6b25 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoGotoStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoGotoStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoGotoStatementImpl extends GoStatementImpl implements GoGotoStatement { - public GoGotoStatementImpl(ASTNode node) { + public GoGotoStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIfStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIfStatementImpl.java index 4c9bbec45f..1e5fb40798 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIfStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIfStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoIfStatementImpl extends GoStatementImpl implements GoIfStatement { - public GoIfStatementImpl(ASTNode node) { + public GoIfStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportDeclarationImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportDeclarationImpl.java index 979edb07ca..411688e57d 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportDeclarationImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportDeclarationImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoImportDeclarationImpl extends GoCompositeElementImpl implements GoImportDeclaration { - public GoImportDeclarationImpl(ASTNode node) { + public GoImportDeclarationImpl(@NotNull ASTNode node) { super(node); } @@ -65,8 +66,9 @@ public PsiElement getImport() { return notNullChild(findChildByType(IMPORT)); } + @Override @NotNull - public GoImportSpec addImportSpec(String packagePath, String alias) { + public GoImportSpec addImportSpec(@NotNull String packagePath, @Nullable String alias) { return GoPsiImplUtil.addImportSpec(this, packagePath, alias); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportListImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportListImpl.java index 17d6b4b7e7..b4b0e3da77 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportListImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportListImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoImportListImpl extends GoCompositeElementImpl implements GoImportList { - public GoImportListImpl(ASTNode node) { + public GoImportListImpl(@NotNull ASTNode node) { super(node); } @@ -47,8 +48,9 @@ public List getImportDeclarationList() { return GoPsiTreeUtil.getChildrenOfTypeAsList(this, GoImportDeclaration.class); } + @Override @NotNull - public GoImportSpec addImport(String packagePath, String alias) { + public GoImportSpec addImport(@NotNull String packagePath, @Nullable String alias) { return GoPsiImplUtil.addImport(this, packagePath, alias); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportSpecImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportSpecImpl.java index bf845e105b..a9084bccad 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportSpecImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportSpecImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoImportSpecStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoImportSpecStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoImportSpecImpl extends GoNamedElementImpl implements GoImportSpec { - public GoImportSpecImpl(GoImportSpecStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoImportSpecImpl(@NotNull GoImportSpecStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoImportSpecImpl(ASTNode node) { + public GoImportSpecImpl(@NotNull ASTNode node) { super(node); } @@ -65,35 +66,43 @@ public PsiElement getIdentifier() { return findChildByType(IDENTIFIER); } + @Override public String getAlias() { return GoPsiImplUtil.getAlias(this); } + @Override public String getLocalPackageName() { return GoPsiImplUtil.getLocalPackageName(this); } + @Override public boolean shouldGoDeeper() { return GoPsiImplUtil.shouldGoDeeper(this); } + @Override public boolean isForSideEffects() { return GoPsiImplUtil.isForSideEffects(this); } + @Override public boolean isDot() { return GoPsiImplUtil.isDot(this); } + @Override @NotNull public String getPath() { return GoPsiImplUtil.getPath(this); } + @Override public String getName() { return GoPsiImplUtil.getName(this); } + @Override public boolean isCImport() { return GoPsiImplUtil.isCImport(this); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportStringImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportStringImpl.java index 32e076d690..ca06f7e443 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportStringImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoImportStringImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,23 +16,23 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiReference; public class GoImportStringImpl extends GoCompositeElementImpl implements GoImportString { - public GoImportStringImpl(ASTNode node) { + public GoImportStringImpl(@NotNull ASTNode node) { super(node); } @@ -50,21 +51,25 @@ public GoStringLiteral getStringLiteral() { return notNullChild(GoPsiTreeUtil.getChildOfType(this, GoStringLiteral.class)); } + @Override @NotNull public PsiReference[] getReferences() { return GoPsiImplUtil.getReferences(this); } + @Override @Nullable public PsiDirectory resolve() { return GoPsiImplUtil.resolve(this); } + @Override @NotNull public String getPath() { return GoPsiImplUtil.getPath(this); } + @Override @NotNull public TextRange getPathTextRange() { return GoPsiImplUtil.getPathTextRange(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIncDecStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIncDecStatementImpl.java index 7edd7205f2..fa6cb13074 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIncDecStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIncDecStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoIncDecStatementImpl extends GoStatementImpl implements GoIncDecStatement { - public GoIncDecStatementImpl(ASTNode node) { + public GoIncDecStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIndexOrSliceExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIndexOrSliceExprImpl.java index 7f46a96204..77a4e3aaeb 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIndexOrSliceExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoIndexOrSliceExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,21 +16,21 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.openapi.util.Trinity; public class GoIndexOrSliceExprImpl extends GoExpressionImpl implements GoIndexOrSliceExpr { - public GoIndexOrSliceExprImpl(ASTNode node) { + public GoIndexOrSliceExprImpl(@NotNull ASTNode node) { super(node); } @@ -60,11 +61,13 @@ public PsiElement getRbrack() { return findChildByType(RBRACK); } + @Override @Nullable public GoExpression getExpression() { return GoPsiImplUtil.getExpression(this); } + @Override @NotNull public Trinity getIndices() { return GoPsiImplUtil.getIndices(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoInterfaceTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoInterfaceTypeImpl.java index cb4d74a83d..ba7738d190 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoInterfaceTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoInterfaceTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoTypeStub; public class GoInterfaceTypeImpl extends GoTypeImpl implements GoInterfaceType { - public GoInterfaceTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoInterfaceTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoInterfaceTypeImpl(ASTNode node) { + public GoInterfaceTypeImpl(@NotNull ASTNode node) { super(node); } @@ -71,11 +72,13 @@ public PsiElement getInterface() { return notNullChild(findChildByType(INTERFACE)); } + @Override @NotNull public List getMethods() { return GoPsiImplUtil.getMethods(this); } + @Override @NotNull public List getBaseTypesReferences() { return GoPsiImplUtil.getBaseTypesReferences(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoKeyImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoKeyImpl.java index bf80c8fdae..8e91357fe5 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoKeyImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoKeyImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoKeyImpl extends GoCompositeElementImpl implements GoKey { - public GoKeyImpl(ASTNode node) { + public GoKeyImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabelDefinitionImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabelDefinitionImpl.java index 21131535b1..4d3e6c4361 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabelDefinitionImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabelDefinitionImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoLabelDefinitionStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoLabelDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoLabelDefinitionImpl extends GoNamedElementImpl implements GoLabelDefinition { - public GoLabelDefinitionImpl(GoLabelDefinitionStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoLabelDefinitionImpl(@NotNull GoLabelDefinitionStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoLabelDefinitionImpl(ASTNode node) { + public GoLabelDefinitionImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabelRefImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabelRefImpl.java index 1871208446..ad99d6ee8e 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabelRefImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabelRefImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,21 +16,21 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.PsiReference; public class GoLabelRefImpl extends GoCompositeElementImpl implements GoLabelRef { - public GoLabelRefImpl(ASTNode node) { + public GoLabelRefImpl(@NotNull ASTNode node) { super(node); } @@ -48,6 +49,7 @@ public PsiElement getIdentifier() { return notNullChild(findChildByType(IDENTIFIER)); } + @Override @NotNull public PsiReference getReference() { return GoPsiImplUtil.getReference(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabeledStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabeledStatementImpl.java index 45db6087dd..4edb742660 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabeledStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLabeledStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoLabeledStatementImpl extends GoStatementImpl implements GoLabeledStatement { - public GoLabeledStatementImpl(ASTNode node) { + public GoLabeledStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLeftHandExprListImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLeftHandExprListImpl.java index eefd6ffaf9..7618281dbf 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLeftHandExprListImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLeftHandExprListImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoLeftHandExprListImpl extends GoCompositeElementImpl implements GoLeftHandExprList { - public GoLeftHandExprListImpl(ASTNode node) { + public GoLeftHandExprListImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralImpl.java index 256be6902e..bdb1ca4b97 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoLiteralImpl extends GoExpressionImpl implements GoLiteral { - public GoLiteralImpl(ASTNode node) { + public GoLiteralImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralTypeExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralTypeExprImpl.java index 6852e60f9e..52af5f601e 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralTypeExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralTypeExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoLiteralTypeExprImpl extends GoExpressionImpl implements GoLiteralTypeExpr { - public GoLiteralTypeExprImpl(ASTNode node) { + public GoLiteralTypeExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralValueImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralValueImpl.java index 319b48fb30..9e8e3258da 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralValueImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoLiteralValueImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoLiteralValueImpl extends GoCompositeElementImpl implements GoLiteralValue { - public GoLiteralValueImpl(ASTNode node) { + public GoLiteralValueImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMapTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMapTypeImpl.java index a266aa513a..0f02e3a212 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMapTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMapTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoTypeStub; public class GoMapTypeImpl extends GoTypeImpl implements GoMapType { - public GoMapTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoMapTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoMapTypeImpl(ASTNode node) { + public GoMapTypeImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMethodDeclarationImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMethodDeclarationImpl.java index 078afa6fdb..66a57314d2 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMethodDeclarationImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMethodDeclarationImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoMethodDeclarationStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoMethodDeclarationStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoMethodDeclarationImpl extends GoFunctionOrMethodDeclarationImpl implements GoMethodDeclaration { - public GoMethodDeclarationImpl(GoMethodDeclarationStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoMethodDeclarationImpl(@NotNull GoMethodDeclarationStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoMethodDeclarationImpl(ASTNode node) { + public GoMethodDeclarationImpl(@NotNull ASTNode node) { super(node); } @@ -77,6 +78,7 @@ public PsiElement getIdentifier() { return findChildByType(IDENTIFIER); } + @Override @Nullable public GoType getReceiverType() { return GoPsiImplUtil.getReceiverType(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMethodSpecImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMethodSpecImpl.java index 68a40fbe0f..5c864b6095 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMethodSpecImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMethodSpecImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,27 +16,27 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoMethodSpecStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoMethodSpecStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.stubs.IStubElementType; public class GoMethodSpecImpl extends GoNamedElementImpl implements GoMethodSpec { - public GoMethodSpecImpl(GoMethodSpecStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoMethodSpecImpl(@NotNull GoMethodSpecStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoMethodSpecImpl(ASTNode node) { + public GoMethodSpecImpl(@NotNull ASTNode node) { super(node); } @@ -66,11 +67,13 @@ public PsiElement getIdentifier() { return findChildByType(IDENTIFIER); } + @Override @Nullable - public GoType getGoTypeInner(ResolveState context) { + public GoType getGoTypeInner(@Nullable ResolveState context) { return GoPsiImplUtil.getGoTypeInner(this, context); } + @Override @Nullable public String getName() { return GoPsiImplUtil.getName(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMulExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMulExprImpl.java index e54f0c3172..6c5536e5cc 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMulExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoMulExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoMulExprImpl extends GoBinaryExprImpl implements GoMulExpr { - public GoMulExprImpl(ASTNode node) { + public GoMulExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoOrExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoOrExprImpl.java index 12fb573d31..b7650ea8ed 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoOrExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoOrExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoOrExprImpl extends GoBinaryExprImpl implements GoOrExpr { - public GoOrExprImpl(ASTNode node) { + public GoOrExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoPackageClauseImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoPackageClauseImpl.java index f9a42ae4e3..c581279fb2 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoPackageClauseImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoPackageClauseImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoPackageClauseStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoPackageClauseStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoPackageClauseImpl extends GoStubbedElementImpl implements GoPackageClause { - public GoPackageClauseImpl(GoPackageClauseStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoPackageClauseImpl(@NotNull GoPackageClauseStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoPackageClauseImpl(ASTNode node) { + public GoPackageClauseImpl(@NotNull ASTNode node) { super(node); } @@ -59,6 +60,7 @@ public PsiElement getPackage() { return notNullChild(findChildByType(PACKAGE)); } + @Override @Nullable public String getName() { return GoPsiImplUtil.getName(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParTypeImpl.java index 6afe778500..8025f53bed 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoTypeStub; public class GoParTypeImpl extends GoTypeImpl implements GoParType { - public GoParTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoParTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoParTypeImpl(ASTNode node) { + public GoParTypeImpl(@NotNull ASTNode node) { super(node); } @@ -65,6 +66,7 @@ public PsiElement getRparen() { return notNullChild(findChildByType(RPAREN)); } + @Override @NotNull public GoType getActualType() { return GoPsiImplUtil.getActualType(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParamDefinitionImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParamDefinitionImpl.java index 15be6e1cc9..a3db3d899c 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParamDefinitionImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParamDefinitionImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoParamDefinitionStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoParamDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoParamDefinitionImpl extends GoNamedElementImpl implements GoParamDefinition { - public GoParamDefinitionImpl(GoParamDefinitionStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoParamDefinitionImpl(@NotNull GoParamDefinitionStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoParamDefinitionImpl(ASTNode node) { + public GoParamDefinitionImpl(@NotNull ASTNode node) { super(node); } @@ -53,6 +54,7 @@ public PsiElement getIdentifier() { return notNullChild(findChildByType(IDENTIFIER)); } + @Override public boolean isVariadic() { return GoPsiImplUtil.isVariadic(this); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParameterDeclarationImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParameterDeclarationImpl.java index 11baa8be2e..0072bd6c34 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParameterDeclarationImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParameterDeclarationImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoParameterDeclarationStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoParameterDeclarationStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoParameterDeclarationImpl extends GoStubbedElementImpl implements GoParameterDeclaration { - public GoParameterDeclarationImpl(GoParameterDeclarationStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoParameterDeclarationImpl(@NotNull GoParameterDeclarationStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoParameterDeclarationImpl(ASTNode node) { + public GoParameterDeclarationImpl(@NotNull ASTNode node) { super(node); } @@ -65,6 +66,7 @@ public PsiElement getTripleDot() { return findChildByType(TRIPLE_DOT); } + @Override public boolean isVariadic() { return GoPsiImplUtil.isVariadic(this); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParametersImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParametersImpl.java index a7325116c4..e27bcc4db2 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParametersImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParametersImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoParametersStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoParametersStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoParametersImpl extends GoStubbedElementImpl implements GoParameters { - public GoParametersImpl(GoParametersStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoParametersImpl(@NotNull GoParametersStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoParametersImpl(ASTNode node) { + public GoParametersImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParenthesesExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParenthesesExprImpl.java index 083510f57f..a5425675a8 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParenthesesExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoParenthesesExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoParenthesesExprImpl extends GoExpressionImpl implements GoParenthesesExpr { - public GoParenthesesExprImpl(ASTNode node) { + public GoParenthesesExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoPointerTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoPointerTypeImpl.java index b8778377d6..71883d8aca 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoPointerTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoPointerTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoTypeStub; public class GoPointerTypeImpl extends GoTypeImpl implements GoPointerType { - public GoPointerTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoPointerTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoPointerTypeImpl(ASTNode node) { + public GoPointerTypeImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoRangeClauseImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoRangeClauseImpl.java index 7721930bcc..988de544e2 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoRangeClauseImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoRangeClauseImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoVarSpecStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoVarSpecStub; public class GoRangeClauseImpl extends GoVarSpecImpl implements GoRangeClause { - public GoRangeClauseImpl(GoVarSpecStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoRangeClauseImpl(@NotNull GoVarSpecStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoRangeClauseImpl(ASTNode node) { + public GoRangeClauseImpl(@NotNull ASTNode node) { super(node); } @@ -65,16 +66,19 @@ public PsiElement getRange() { return findChildByType(RANGE); } + @Override @Nullable public GoExpression getRangeExpression() { return GoPsiImplUtil.getRangeExpression(this); } + @Override @NotNull public List getLeftExpressionsList() { return GoPsiImplUtil.getLeftExpressionsList(this); } + @Override @NotNull public List getRightExpressionsList() { return GoPsiImplUtil.getRightExpressionsList(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReceiverImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReceiverImpl.java index 946324c501..503b6e23a4 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReceiverImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReceiverImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,27 +16,27 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoReceiverStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoReceiverStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.stubs.IStubElementType; public class GoReceiverImpl extends GoNamedElementImpl implements GoReceiver { - public GoReceiverImpl(GoReceiverStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoReceiverImpl(@NotNull GoReceiverStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoReceiverImpl(ASTNode node) { + public GoReceiverImpl(@NotNull ASTNode node) { super(node); } @@ -78,8 +79,9 @@ public PsiElement getIdentifier() { return findChildByType(IDENTIFIER); } + @Override @Nullable - public GoType getGoTypeInner(ResolveState context) { + public GoType getGoTypeInner(@Nullable ResolveState context) { return GoPsiImplUtil.getGoTypeInner(this, context); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoRecvStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoRecvStatementImpl.java index 88119a0e9c..1484cc56c0 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoRecvStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoRecvStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoVarSpecStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoVarSpecStub; public class GoRecvStatementImpl extends GoVarSpecImpl implements GoRecvStatement { - public GoRecvStatementImpl(GoVarSpecStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoRecvStatementImpl(@NotNull GoVarSpecStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoRecvStatementImpl(ASTNode node) { + public GoRecvStatementImpl(@NotNull ASTNode node) { super(node); } @@ -65,16 +66,19 @@ public PsiElement getVarAssign() { return findChildByType(VAR_ASSIGN); } + @Override @Nullable public GoExpression getRecvExpression() { return GoPsiImplUtil.getRecvExpression(this); } + @Override @NotNull public List getLeftExpressionsList() { return GoPsiImplUtil.getLeftExpressionsList(this); } + @Override @NotNull public List getRightExpressionsList() { return GoPsiImplUtil.getRightExpressionsList(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReferenceExpressionImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReferenceExpressionImpl.java index b87d4c7a94..ba4deb1fc9 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReferenceExpressionImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReferenceExpressionImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,21 +16,21 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector.Access; public class GoReferenceExpressionImpl extends GoExpressionImpl implements GoReferenceExpression { - public GoReferenceExpressionImpl(ASTNode node) { + public GoReferenceExpressionImpl(@NotNull ASTNode node) { super(node); } @@ -48,21 +49,25 @@ public PsiElement getIdentifier() { return notNullChild(findChildByType(IDENTIFIER)); } + @Override @NotNull public GoReference getReference() { return GoPsiImplUtil.getReference(this); } + @Override @Nullable public GoReferenceExpression getQualifier() { return GoPsiImplUtil.getQualifier(this); } + @Override @Nullable public PsiElement resolve() { return GoPsiImplUtil.resolve(this); } + @Override @NotNull public Access getReadWriteAccess() { return GoPsiImplUtil.getReadWriteAccess(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoResultImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoResultImpl.java index dda6b4cf70..8d7c2477b9 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoResultImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoResultImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoResultStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoResultStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoResultImpl extends GoStubbedElementImpl implements GoResult { - public GoResultImpl(GoResultStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoResultImpl(@NotNull GoResultStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoResultImpl(ASTNode node) { + public GoResultImpl(@NotNull ASTNode node) { super(node); } @@ -71,6 +72,7 @@ public PsiElement getRparen() { return findChildByType(RPAREN); } + @Override public boolean isVoid() { return GoPsiImplUtil.isVoid(this); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReturnStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReturnStatementImpl.java index f6ddba16c8..33fbdbb931 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReturnStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoReturnStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoReturnStatementImpl extends GoStatementImpl implements GoReturnStatement { - public GoReturnStatementImpl(ASTNode node) { + public GoReturnStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSelectStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSelectStatementImpl.java index 149e09a628..9906c204ce 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSelectStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSelectStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoSelectStatementImpl extends GoStatementImpl implements GoSelectStatement { - public GoSelectStatementImpl(ASTNode node) { + public GoSelectStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSelectorExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSelectorExprImpl.java index 858ac2ae0e..00f863b218 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSelectorExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSelectorExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoSelectorExprImpl extends GoBinaryExprImpl implements GoSelectorExpr { - public GoSelectorExprImpl(ASTNode node) { + public GoSelectorExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSendStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSendStatementImpl.java index 0fe45bcbbd..b4b0108cf7 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSendStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSendStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoSendStatementImpl extends GoStatementImpl implements GoSendStatement { - public GoSendStatementImpl(ASTNode node) { + public GoSendStatementImpl(@NotNull ASTNode node) { super(node); } @@ -59,6 +60,7 @@ public PsiElement getSendChannel() { return notNullChild(findChildByType(SEND_CHANNEL)); } + @Override @Nullable public GoExpression getSendExpression() { return GoPsiImplUtil.getSendExpression(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoShortVarDeclarationImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoShortVarDeclarationImpl.java index 358595ace3..9b6622ade3 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoShortVarDeclarationImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoShortVarDeclarationImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoVarSpecStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoVarSpecStub; public class GoShortVarDeclarationImpl extends GoVarSpecImpl implements GoShortVarDeclaration { - public GoShortVarDeclarationImpl(GoVarSpecStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoShortVarDeclarationImpl(@NotNull GoVarSpecStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoShortVarDeclarationImpl(ASTNode node) { + public GoShortVarDeclarationImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSignatureImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSignatureImpl.java index 9b4b4fcb3d..2c4abf8d68 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSignatureImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSignatureImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoSignatureStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoSignatureStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoSignatureImpl extends GoStubbedElementImpl implements GoSignature { - public GoSignatureImpl(GoSignatureStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoSignatureImpl(@NotNull GoSignatureStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoSignatureImpl(ASTNode node) { + public GoSignatureImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSimpleStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSimpleStatementImpl.java index 9e17ce314b..bd454e8c1c 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSimpleStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSimpleStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoSimpleStatementImpl extends GoStatementImpl implements GoSimpleStatement { - public GoSimpleStatementImpl(ASTNode node) { + public GoSimpleStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSpecTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSpecTypeImpl.java index 067a69854a..bb955e529a 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSpecTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSpecTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.stubs.GoTypeStub; import com.intellij.psi.stubs.IStubElementType; public class GoSpecTypeImpl extends GoTypeImpl implements GoSpecType { - public GoSpecTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoSpecTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoSpecTypeImpl(ASTNode node) { + public GoSpecTypeImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStatementImpl.java index ec506d7c59..6290cf9c3b 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,22 +16,22 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.scope.PsiScopeProcessor; public class GoStatementImpl extends GoCompositeElementImpl implements GoStatement { - public GoStatementImpl(ASTNode node) { + public GoStatementImpl(@NotNull ASTNode node) { super(node); } @@ -67,7 +68,8 @@ public GoVarDeclaration getVarDeclaration() { return GoPsiTreeUtil.getChildOfType(this, GoVarDeclaration.class); } - public boolean processDeclarations(PsiScopeProcessor processor, ResolveState state, PsiElement lastParent, PsiElement place) { + @Override + public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place) { return GoPsiImplUtil.processDeclarations(this, processor, state, lastParent, place); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStringLiteralImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStringLiteralImpl.java index 5dbfdc2814..d122857e3d 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStringLiteralImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStringLiteralImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,21 +16,21 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.util.GoStringLiteralEscaper; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.parser.GoStringLiteralEscaper; public class GoStringLiteralImpl extends GoExpressionImpl implements GoStringLiteral { - public GoStringLiteralImpl(ASTNode node) { + public GoStringLiteralImpl(@NotNull ASTNode node) { super(node); } @@ -54,20 +55,24 @@ public PsiElement getString() { return findChildByType(STRING); } + @Override public boolean isValidHost() { return GoPsiImplUtil.isValidHost(this); } + @Override @NotNull - public GoStringLiteralImpl updateText(String text) { + public GoStringLiteralImpl updateText(@NotNull String text) { return GoPsiImplUtil.updateText(this, text); } + @Override @NotNull public GoStringLiteralEscaper createLiteralTextEscaper() { return GoPsiImplUtil.createLiteralTextEscaper(this); } + @Override @NotNull public String getDecodedText() { return GoPsiImplUtil.getDecodedText(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStructTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStructTypeImpl.java index 953918cd1c..2a50531d16 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStructTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoStructTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoTypeStub; public class GoStructTypeImpl extends GoTypeImpl implements GoStructType { - public GoStructTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoStructTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoStructTypeImpl(ASTNode node) { + public GoStructTypeImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSwitchStartImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSwitchStartImpl.java index 7eb67a03f9..1f3bd23cf6 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSwitchStartImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSwitchStartImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoSwitchStartImpl extends GoCompositeElementImpl implements GoSwitchStart { - public GoSwitchStartImpl(ASTNode node) { + public GoSwitchStartImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSwitchStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSwitchStatementImpl.java index 4de40ad8b6..46e3e6addd 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSwitchStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoSwitchStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoSwitchStatementImpl extends GoStatementImpl implements GoSwitchStatement { - public GoSwitchStatementImpl(ASTNode node) { + public GoSwitchStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTagImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTagImpl.java index 9bc8c6e370..25abc242c3 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTagImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTagImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoTagImpl extends GoCompositeElementImpl implements GoTag { - public GoTagImpl(ASTNode node) { + public GoTagImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeAssertionExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeAssertionExprImpl.java index 94ec8d696b..f0bfc1ab81 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeAssertionExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeAssertionExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoTypeAssertionExprImpl extends GoExpressionImpl implements GoTypeAssertionExpr { - public GoTypeAssertionExprImpl(ASTNode node) { + public GoTypeAssertionExprImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeCaseClauseImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeCaseClauseImpl.java index 32e7a7d67e..3d93b38af3 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeCaseClauseImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeCaseClauseImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoTypeCaseClauseImpl extends GoCompositeElementImpl implements GoTypeCaseClause { - public GoTypeCaseClauseImpl(ASTNode node) { + public GoTypeCaseClauseImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeDeclarationImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeDeclarationImpl.java index 194fc72ece..30182bc51b 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeDeclarationImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeDeclarationImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoTypeDeclarationImpl extends GoCompositeElementImpl implements GoTypeDeclaration { - public GoTypeDeclarationImpl(ASTNode node) { + public GoTypeDeclarationImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeGuardImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeGuardImpl.java index 718a245789..94bfffe437 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeGuardImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeGuardImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoTypeGuardImpl extends GoCompositeElementImpl implements GoTypeGuard { - public GoTypeGuardImpl(ASTNode node) { + public GoTypeGuardImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeImpl.java index 161933bec3..818da2bbf7 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoTypeStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; public class GoTypeImpl extends GoStubbedElementImpl implements GoType { - public GoTypeImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoTypeImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoTypeImpl(ASTNode node) { + public GoTypeImpl(@NotNull ASTNode node) { super(node); } @@ -53,11 +54,13 @@ public GoTypeReferenceExpression getTypeReferenceExpression() { return GoPsiTreeUtil.getChildOfType(this, GoTypeReferenceExpression.class); } + @Override @NotNull public GoType getUnderlyingType() { return GoPsiImplUtil.getUnderlyingType(this); } + @Override public boolean shouldGoDeeper() { return GoPsiImplUtil.shouldGoDeeper(this); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeListImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeListImpl.java index e82ac6e89c..959b2dc7ce 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeListImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeListImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,26 +16,26 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.stubs.IStubElementType; +import com.notzippy.intellij.go.stubs.GoTypeStub; public class GoTypeListImpl extends GoTypeImpl implements GoTypeList { - public GoTypeListImpl(GoTypeStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoTypeListImpl(@NotNull GoTypeStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoTypeListImpl(ASTNode node) { + public GoTypeListImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeReferenceExpressionImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeReferenceExpressionImpl.java index fe9b396ba8..afb4bedc2a 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeReferenceExpressionImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeReferenceExpressionImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,21 +16,21 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.PsiReference; public class GoTypeReferenceExpressionImpl extends GoCompositeElementImpl implements GoTypeReferenceExpression { - public GoTypeReferenceExpressionImpl(ASTNode node) { + public GoTypeReferenceExpressionImpl(@NotNull ASTNode node) { super(node); } @@ -48,21 +49,25 @@ public PsiElement getIdentifier() { return notNullChild(findChildByType(IDENTIFIER)); } + @Override @NotNull public PsiReference getReference() { return GoPsiImplUtil.getReference(this); } + @Override @Nullable public GoTypeReferenceExpression getQualifier() { return GoPsiImplUtil.getQualifier(this); } + @Override @Nullable public PsiElement resolve() { return GoPsiImplUtil.resolve(this); } + @Override @Nullable public GoType resolveType() { return GoPsiImplUtil.resolveType(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSpecImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSpecImpl.java index dc4a96d61e..d0221d9f30 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSpecImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSpecImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,27 +16,27 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoTypeSpecStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoTypeSpecStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.stubs.IStubElementType; public class GoTypeSpecImpl extends GoNamedElementImpl implements GoTypeSpec { - public GoTypeSpecImpl(GoTypeSpecStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoTypeSpecImpl(@NotNull GoTypeSpecStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoTypeSpecImpl(ASTNode node) { + public GoTypeSpecImpl(@NotNull ASTNode node) { super(node); } @@ -54,16 +55,19 @@ public GoSpecType getSpecType() { return notNullChild(GoPsiTreeUtil.getStubChildOfType(this, GoSpecType.class)); } + @Override @Nullable - public GoType getGoTypeInner(ResolveState context) { + public GoType getGoTypeInner(@Nullable ResolveState context) { return GoPsiImplUtil.getGoTypeInner(this, context); } + @Override @NotNull public List getMethods() { return GoPsiImplUtil.getMethods(this); } + @Override public boolean shouldGoDeeper() { return GoPsiImplUtil.shouldGoDeeper(this); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSwitchGuardImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSwitchGuardImpl.java index f75927d1a6..3c61615eb2 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSwitchGuardImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSwitchGuardImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoTypeSwitchGuardImpl extends GoCompositeElementImpl implements GoTypeSwitchGuard { - public GoTypeSwitchGuardImpl(ASTNode node) { + public GoTypeSwitchGuardImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSwitchStatementImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSwitchStatementImpl.java index ed2e04f2e1..f9ad7f4192 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSwitchStatementImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoTypeSwitchStatementImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoTypeSwitchStatementImpl extends GoSwitchStatementImpl implements GoTypeSwitchStatement { - public GoTypeSwitchStatementImpl(ASTNode node) { + public GoTypeSwitchStatementImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoUnaryExprImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoUnaryExprImpl.java index 52a616bc2b..90fdf0f81d 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoUnaryExprImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoUnaryExprImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoUnaryExprImpl extends GoExpressionImpl implements GoUnaryExpr { - public GoUnaryExprImpl(ASTNode node) { + public GoUnaryExprImpl(@NotNull ASTNode node) { super(node); } @@ -89,6 +90,7 @@ public PsiElement getSendChannel() { return findChildByType(SEND_CHANNEL); } + @Override @Nullable public PsiElement getOperator() { return GoPsiImplUtil.getOperator(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoValueImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoValueImpl.java index 742c9fcf49..e11c34ae46 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoValueImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoValueImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoValueImpl extends GoCompositeElementImpl implements GoValue { - public GoValueImpl(ASTNode node) { + public GoValueImpl(@NotNull ASTNode node) { super(node); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarDeclarationImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarDeclarationImpl.java index c88847e501..54c06b1610 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarDeclarationImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarDeclarationImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,20 +16,20 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.grammar.psi.*; public class GoVarDeclarationImpl extends GoCompositeElementImpl implements GoVarDeclaration { - public GoVarDeclarationImpl(ASTNode node) { + public GoVarDeclarationImpl(@NotNull ASTNode node) { super(node); } @@ -65,12 +66,14 @@ public PsiElement getVar() { return notNullChild(findChildByType(VAR)); } + @Override @NotNull - public GoVarSpec addSpec(String name, String type, String value, GoVarSpec specAnchor) { + public GoVarSpec addSpec(@NotNull String name, @Nullable String type, @Nullable String value, @Nullable GoVarSpec specAnchor) { return GoPsiImplUtil.addSpec(this, name, type, value, specAnchor); } - public void deleteSpec(GoVarSpec specToDelete) { + @Override + public void deleteSpec(@NotNull GoVarSpec specToDelete) { GoPsiImplUtil.deleteSpec(this, specToDelete); } diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarDefinitionImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarDefinitionImpl.java index 7edc71fe20..14d4115973 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarDefinitionImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarDefinitionImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,28 +16,28 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoVarDefinitionStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoVarDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.PsiReference; import com.intellij.psi.ResolveState; import com.intellij.psi.stubs.IStubElementType; public class GoVarDefinitionImpl extends GoNamedElementImpl implements GoVarDefinition { - public GoVarDefinitionImpl(GoVarDefinitionStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoVarDefinitionImpl(@NotNull GoVarDefinitionStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoVarDefinitionImpl(ASTNode node) { + public GoVarDefinitionImpl(@NotNull ASTNode node) { super(node); } @@ -55,16 +56,19 @@ public PsiElement getIdentifier() { return notNullChild(findChildByType(IDENTIFIER)); } + @Override @Nullable - public GoType getGoTypeInner(ResolveState context) { + public GoType getGoTypeInner(@Nullable ResolveState context) { return GoPsiImplUtil.getGoTypeInner(this, context); } + @Override @Nullable public PsiReference getReference() { return GoPsiImplUtil.getReference(this); } + @Override @Nullable public GoExpression getValue() { return GoPsiImplUtil.getValue(this); diff --git a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarSpecImpl.java b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarSpecImpl.java index 831996264e..68a32ea511 100644 --- a/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarSpecImpl.java +++ b/src/main/gen/com/notzippy/intellij/go/grammar/psi/impl/GoVarSpecImpl.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,28 +16,28 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import java.util.List; import org.jetbrains.annotations.*; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.goide.psi.GoPsiTreeUtil; -import static com.goide.GoTypes.*; -import com.goide.stubs.GoVarSpecStub; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import com.notzippy.intellij.go.stubs.GoVarSpecStub; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.ResolveState; import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.psi.stubs.IStubElementType; public class GoVarSpecImpl extends GoStubbedElementImpl implements GoVarSpec { - public GoVarSpecImpl(GoVarSpecStub stub, IStubElementType nodeType) { - super(stub, nodeType); + public GoVarSpecImpl(@NotNull GoVarSpecStub stub, @NotNull IStubElementType type) { + super(stub, type); } - public GoVarSpecImpl(ASTNode node) { + public GoVarSpecImpl(@NotNull ASTNode node) { super(node); } @@ -73,14 +74,17 @@ public PsiElement getAssign() { return findChildByType(ASSIGN); } - public boolean processDeclarations(PsiScopeProcessor processor, ResolveState state, PsiElement lastParent, PsiElement place) { + @Override + public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place) { return GoPsiImplUtil.processDeclarations(this, processor, state, lastParent, place); } - public void deleteDefinition(GoVarDefinition definitionToDelete) { + @Override + public void deleteDefinition(@NotNull GoVarDefinition definitionToDelete) { GoPsiImplUtil.deleteDefinition(this, definitionToDelete); } + @Override @NotNull public List getRightExpressionsList() { return GoPsiImplUtil.getRightExpressionsList(this); diff --git a/src/main/gen/com/notzippy/intellij/go/lexer/_GoLexer.java b/src/main/gen/com/notzippy/intellij/go/lexer/_GoLexer.java index 6d1c6686ac..c443c488db 100644 --- a/src/main/gen/com/notzippy/intellij/go/lexer/_GoLexer.java +++ b/src/main/gen/com/notzippy/intellij/go/lexer/_GoLexer.java @@ -1,17 +1,17 @@ -/* The following code was generated by JFlex 1.7.0-SNAPSHOT tweaked for IntelliJ platform */ +/* The following code was generated by JFlex 1.7.0 tweaked for IntelliJ platform */ -package com.goide.lexer; +package com.notzippy.intellij.go.lexer; import com.intellij.lexer.FlexLexer; import com.intellij.psi.tree.IElementType; -import com.goide.GoTypes; +import com.notzippy.intellij.go.parser.GoTypes; import static com.intellij.psi.TokenType.BAD_CHARACTER; -import static com.goide.GoParserDefinition.*; +import static com.notzippy.intellij.go.intellij.GoParserDefinition.*; /** * This class is a scanner generated by - * JFlex 1.7.0-SNAPSHOT + * JFlex 1.7.0 * from the specification file go.flex */ public class _GoLexer implements FlexLexer, GoTypes { @@ -39,7 +39,7 @@ public class _GoLexer implements FlexLexer, GoTypes { /** * Translates characters to character classes * Chosen bits are [11, 6, 4] - * Total runtime size is 13792 bytes + * Total runtime size is 14336 bytes */ public static int ZZ_CMAP(int ch) { return ZZ_CMAP_A[(ZZ_CMAP_Y[(ZZ_CMAP_Z[ch>>10]<<6)|((ch>>4)&0x3f)]<<4)|(ch&0xf)]; @@ -49,11 +49,11 @@ public static int ZZ_CMAP(int ch) { static final char ZZ_CMAP_Z[] = zzUnpackCMap( "\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\2\11\1\12\1\13\6\14\1\15\23\14\1\16"+ "\1\14\1\17\1\20\12\14\1\21\10\11\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1"+ - "\32\1\11\1\33\1\34\2\11\1\14\1\35\3\11\1\36\10\11\1\37\1\40\20\11\1\41\2\11"+ - "\1\42\5\11\1\43\4\11\1\44\1\45\4\11\51\14\1\46\3\14\1\47\1\50\4\14\1\51\12"+ - "\11\1\52\u0381\11"); + "\32\1\33\1\34\1\35\2\11\1\14\1\36\3\11\1\37\10\11\1\40\1\41\5\14\1\42\1\43"+ + "\11\11\1\44\2\11\1\45\5\11\1\46\4\11\1\47\1\50\4\11\51\14\1\51\3\14\1\52\1"+ + "\53\4\14\1\54\12\11\1\55\u0381\11"); - /* The ZZ_CMAP_Y table has 2752 entries */ + /* The ZZ_CMAP_Y table has 2944 entries */ static final char ZZ_CMAP_Y[] = zzUnpackCMap( "\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\1\1\11\1\12\1\13\1\14\1\13\1\14\34"+ "\13\1\15\1\16\1\17\10\1\1\20\1\21\1\13\1\22\4\13\1\23\10\13\1\24\12\13\1\25"+ @@ -63,54 +63,56 @@ public static int ZZ_CMAP(int ch) { "\1\53\1\25\1\54\1\55\1\56\1\57\1\60\1\61\1\53\1\16\1\62\1\55\1\56\1\63\1\1"+ "\1\64\1\65\1\66\1\67\1\22\1\56\1\70\1\1\1\71\1\53\1\72\1\73\1\55\1\56\1\70"+ "\1\1\1\61\1\53\1\41\1\74\1\75\1\76\1\77\1\1\1\71\1\65\1\1\1\100\1\36\1\56"+ - "\1\51\1\1\1\101\1\53\1\1\1\100\1\36\1\56\1\102\1\1\1\60\1\53\1\103\1\100\1"+ - "\36\1\13\1\104\1\60\1\105\1\53\1\106\1\107\1\110\1\13\1\111\1\112\1\1\1\65"+ - "\1\1\1\25\2\13\1\113\1\112\1\114\2\1\1\115\1\116\1\117\1\120\1\121\1\122\2"+ - "\1\1\71\1\1\1\114\1\1\1\123\1\13\1\124\1\1\1\125\7\1\2\13\1\30\1\105\1\114"+ - "\1\126\1\127\1\130\1\131\1\114\2\13\1\132\2\13\1\133\24\13\1\134\1\135\2\13"+ - "\1\134\2\13\1\136\1\137\1\14\3\13\1\137\3\13\1\30\2\1\1\13\1\1\5\13\1\140"+ - "\1\25\45\13\1\141\1\13\1\25\1\30\4\13\1\30\1\142\1\143\1\16\1\13\1\16\1\13"+ - "\1\16\1\143\1\71\3\13\1\144\1\1\1\145\1\114\2\1\1\114\5\13\1\27\2\13\1\146"+ - "\4\13\1\40\1\13\1\147\2\1\1\65\1\13\1\150\1\47\2\13\1\151\1\13\1\77\1\114"+ - "\2\1\1\13\1\112\3\13\1\47\2\1\2\114\1\152\5\1\1\107\2\13\1\144\1\153\1\114"+ - "\2\1\1\154\1\13\1\155\1\42\2\13\1\40\1\1\2\13\1\144\1\1\1\156\1\42\1\13\1"+ - "\150\6\1\1\157\1\160\14\13\4\1\21\13\1\140\2\13\1\140\1\161\1\13\1\150\3\13"+ - "\1\162\1\163\1\164\1\124\1\163\2\1\1\165\4\1\1\166\1\1\1\124\6\1\1\167\1\170"+ - "\1\171\1\172\1\173\3\1\1\174\147\1\2\13\1\147\2\13\1\147\10\13\1\175\1\176"+ - "\2\13\1\132\3\13\1\177\1\1\1\13\1\112\4\200\4\1\1\105\35\1\1\201\2\1\1\202"+ - "\1\25\4\13\1\203\1\25\4\13\1\133\1\107\1\13\1\150\1\25\4\13\1\147\1\1\1\13"+ - "\1\30\3\1\1\13\40\1\133\13\1\40\4\1\135\13\1\40\2\1\10\13\1\124\4\1\2\13\1"+ - "\150\20\13\1\124\1\13\1\204\1\1\2\13\1\147\1\105\1\13\1\150\4\13\1\40\2\1"+ - "\1\205\1\206\5\13\1\207\1\13\1\150\1\27\3\1\1\205\1\210\1\13\1\31\1\1\3\13"+ - "\1\144\1\206\2\13\1\144\1\1\1\114\1\1\1\211\1\42\1\13\1\40\1\13\1\112\1\1"+ - "\1\13\1\124\1\50\2\13\1\31\1\105\1\114\1\212\1\213\2\13\1\46\1\1\1\214\1\114"+ - "\1\13\1\215\3\13\1\216\1\217\1\220\1\30\1\66\1\221\1\222\1\200\2\13\1\133"+ - "\1\40\7\13\1\31\1\114\72\13\1\144\1\13\1\223\2\13\1\151\20\1\26\13\1\150\6"+ - "\13\1\77\2\1\1\112\1\224\1\56\1\225\1\226\6\13\1\16\1\1\1\154\25\13\1\150"+ - "\1\1\4\13\1\206\2\13\1\27\2\1\1\151\7\1\1\212\7\13\1\124\1\1\1\114\1\25\1"+ - "\30\1\25\1\30\1\227\4\13\1\147\1\230\1\231\2\1\1\232\1\13\1\14\1\233\2\150"+ - "\2\1\7\13\1\30\30\1\1\13\1\124\3\13\1\71\2\1\2\13\1\1\1\13\1\234\2\13\1\40"+ - "\1\13\1\150\2\13\1\235\3\1\11\13\1\150\1\114\5\1\2\13\1\27\3\13\1\144\11\1"+ - "\23\13\1\112\1\13\1\40\1\27\11\1\1\236\2\13\1\237\1\13\1\40\1\13\1\112\1\13"+ - "\1\147\4\1\1\13\1\240\1\13\1\40\1\13\1\77\4\1\3\13\1\241\4\1\1\71\1\242\1"+ - "\13\1\144\2\1\1\13\1\124\1\13\1\124\2\1\1\123\1\13\1\47\1\1\3\13\1\40\1\13"+ - "\1\40\1\13\1\31\1\13\1\16\6\1\4\13\1\46\3\1\3\13\1\31\3\13\1\31\60\1\1\154"+ - "\2\13\1\27\2\1\1\65\1\1\1\154\2\13\2\1\1\13\1\46\1\114\1\154\1\13\1\112\1"+ - "\65\1\1\2\13\1\243\1\154\2\13\1\31\1\244\1\245\2\1\1\13\1\22\1\151\5\1\1\246"+ - "\1\247\1\46\2\13\1\147\1\1\1\114\1\73\1\55\1\56\1\70\1\1\1\250\1\16\21\1\3"+ - "\13\1\1\1\251\1\114\12\1\2\13\1\147\2\1\1\252\2\1\3\13\1\1\1\253\1\114\2\1"+ - "\2\13\1\30\1\1\1\114\3\1\1\13\1\77\1\1\1\114\26\1\4\13\1\114\1\105\34\1\3"+ - "\13\1\46\20\1\71\13\1\77\16\1\14\13\1\144\53\1\2\13\1\147\75\1\44\13\1\112"+ - "\33\1\43\13\1\46\1\13\1\147\1\114\6\1\1\13\1\150\1\1\3\13\1\1\1\144\1\114"+ - "\1\154\1\254\1\13\67\1\4\13\1\47\1\71\3\1\1\154\6\1\1\16\77\1\6\13\1\30\1"+ - "\124\1\46\1\77\66\1\5\13\1\212\3\13\1\143\1\255\1\256\1\257\3\13\1\260\1\261"+ - "\1\13\1\262\1\263\1\36\24\13\1\264\1\13\1\36\1\133\1\13\1\133\1\13\1\212\1"+ - "\13\1\212\1\147\1\13\1\147\1\13\1\56\1\13\1\56\1\13\1\265\3\266\14\13\1\47"+ - "\123\1\1\257\1\13\1\267\1\270\1\271\1\272\1\273\1\274\1\275\1\151\1\276\1"+ - "\151\24\1\55\13\1\112\2\1\103\13\1\47\15\13\1\150\150\13\1\16\25\1\41\13\1"+ - "\150\36\1"); - - /* The ZZ_CMAP_A table has 3056 entries */ + "\1\51\1\1\1\101\1\53\1\1\1\102\1\36\1\56\1\103\1\1\1\60\1\53\1\104\1\100\1"+ + "\36\1\13\1\105\1\60\1\106\1\53\1\107\1\110\1\111\1\13\1\112\1\113\1\1\1\65"+ + "\1\1\1\25\2\13\1\114\1\113\1\115\2\1\1\116\1\117\1\120\1\121\1\122\1\123\2"+ + "\1\1\71\1\1\1\115\1\1\1\124\1\13\1\125\1\1\1\126\7\1\2\13\1\30\1\127\1\115"+ + "\1\130\1\131\1\132\1\133\1\115\2\13\1\134\2\13\1\135\24\13\1\136\1\137\2\13"+ + "\1\136\2\13\1\140\1\141\1\14\3\13\1\141\3\13\1\30\2\1\1\13\1\1\5\13\1\142"+ + "\1\25\45\13\1\143\1\13\1\25\1\30\4\13\1\30\1\144\1\145\1\16\1\13\1\16\1\13"+ + "\1\16\1\145\1\71\3\13\1\146\1\1\1\147\1\115\2\1\1\115\5\13\1\27\1\150\1\13"+ + "\1\151\4\13\1\40\1\13\1\152\2\1\1\65\1\13\1\153\1\154\2\13\1\155\1\13\1\77"+ + "\1\115\2\1\1\13\1\113\3\13\1\154\2\1\2\115\1\156\5\1\1\110\2\13\1\146\1\157"+ + "\1\115\2\1\1\160\1\13\1\161\1\42\2\13\1\40\1\1\2\13\1\146\1\1\1\162\1\42\1"+ + "\13\1\153\1\46\5\1\1\163\1\164\14\13\4\1\21\13\1\142\2\13\1\142\1\165\1\13"+ + "\1\153\3\13\1\166\1\167\1\170\1\125\1\167\2\1\1\171\4\1\1\172\1\1\1\125\6"+ + "\1\1\173\1\174\1\175\1\176\1\177\3\1\1\200\147\1\2\13\1\152\2\13\1\152\10"+ + "\13\1\201\1\202\2\13\1\134\3\13\1\203\1\1\1\13\1\113\4\204\4\1\1\127\35\1"+ + "\1\205\2\1\1\206\1\25\4\13\1\207\1\25\4\13\1\135\1\110\1\13\1\153\1\25\4\13"+ + "\1\152\1\1\1\13\1\30\3\1\1\13\40\1\133\13\1\40\4\1\135\13\1\40\2\1\10\13\1"+ + "\125\4\1\2\13\1\153\20\13\1\125\1\13\1\210\1\1\2\13\1\152\1\127\1\13\1\153"+ + "\4\13\1\40\2\1\1\211\1\212\5\13\1\213\1\13\1\152\1\27\3\1\1\211\1\214\1\13"+ + "\1\31\1\1\3\13\1\146\1\212\2\13\1\146\1\1\1\115\1\1\1\215\1\42\1\13\1\40\1"+ + "\13\1\113\1\1\1\13\1\125\1\50\2\13\1\31\1\127\1\115\1\216\1\217\2\13\1\46"+ + "\1\1\1\220\1\115\1\13\1\221\3\13\1\222\1\223\1\224\1\30\1\66\1\225\1\226\1"+ + "\204\2\13\1\135\1\40\7\13\1\31\1\115\72\13\1\146\1\13\1\227\2\13\1\155\20"+ + "\1\26\13\1\153\6\13\1\77\2\1\1\113\1\230\1\56\1\231\1\232\6\13\1\16\1\1\1"+ + "\160\25\13\1\153\1\1\4\13\1\212\2\13\1\27\2\1\1\155\7\1\1\216\7\13\1\125\1"+ + "\1\1\115\1\25\1\30\1\25\1\30\1\233\4\13\1\152\1\234\1\235\2\1\1\236\1\13\1"+ + "\14\1\237\2\153\2\1\7\13\1\30\30\1\1\13\1\125\3\13\1\71\2\1\2\13\1\1\1\13"+ + "\1\240\2\13\1\40\1\13\1\153\2\13\1\241\3\1\11\13\1\153\1\115\2\13\1\241\1"+ + "\13\1\155\2\13\1\27\3\13\1\146\11\1\23\13\1\113\1\13\1\40\1\27\11\1\1\242"+ + "\2\13\1\243\1\13\1\40\1\13\1\113\1\13\1\152\4\1\1\13\1\244\1\13\1\40\1\13"+ + "\1\77\4\1\3\13\1\245\4\1\1\71\1\246\1\13\1\146\2\1\1\13\1\125\1\13\1\125\2"+ + "\1\1\124\1\13\1\154\1\1\3\13\1\40\1\13\1\40\1\13\1\31\1\13\1\16\6\1\4\13\1"+ + "\46\3\1\3\13\1\31\3\13\1\31\60\1\1\160\2\13\1\27\2\1\1\65\1\1\1\160\2\13\2"+ + "\1\1\13\1\46\1\115\1\160\1\13\1\113\1\65\1\1\2\13\1\247\1\160\2\13\1\31\1"+ + "\250\1\251\2\1\1\13\1\22\1\155\5\1\1\252\1\253\1\46\2\13\1\152\1\1\1\115\1"+ + "\73\1\55\1\56\1\70\1\1\1\254\1\16\11\1\3\13\1\154\1\255\1\115\2\1\3\13\1\1"+ + "\1\256\1\115\12\1\2\13\1\152\2\1\1\257\2\1\3\13\1\1\1\260\1\115\2\1\2\13\1"+ + "\30\1\1\1\115\3\1\1\13\1\77\1\1\1\115\26\1\4\13\1\115\1\127\34\1\3\13\1\46"+ + "\20\1\1\56\1\13\1\152\1\1\1\71\1\115\1\1\1\212\1\13\67\1\71\13\1\77\16\1\14"+ + "\13\1\146\53\1\2\13\1\152\75\1\44\13\1\113\33\1\43\13\1\46\1\13\1\152\1\115"+ + "\6\1\1\13\1\153\1\1\3\13\1\1\1\146\1\115\1\160\1\261\1\13\67\1\4\13\1\154"+ + "\1\71\3\1\1\160\4\1\1\71\1\1\76\13\1\125\1\1\57\13\1\31\20\1\1\16\77\1\6\13"+ + "\1\30\1\125\1\46\1\77\66\1\5\13\1\216\3\13\1\145\1\262\1\263\1\264\3\13\1"+ + "\265\1\266\1\13\1\267\1\270\1\36\24\13\1\271\1\13\1\36\1\135\1\13\1\135\1"+ + "\13\1\216\1\13\1\216\1\152\1\13\1\152\1\13\1\56\1\13\1\56\1\13\1\272\3\273"+ + "\14\13\1\154\3\1\4\13\1\146\1\115\112\1\1\264\1\13\1\274\1\275\1\276\1\277"+ + "\1\300\1\301\1\302\1\155\1\303\1\155\24\1\55\13\1\113\2\1\103\13\1\154\15"+ + "\13\1\153\150\13\1\16\25\1\41\13\1\153\36\1"); + + /* The ZZ_CMAP_A table has 3136 entries */ static final char ZZ_CMAP_A[] = zzUnpackCMap( "\11\0\1\4\1\2\1\1\1\5\1\3\22\0\1\4\1\47\1\23\2\0\1\54\1\51\1\31\1\41\1\42"+ "\1\7\1\50\1\45\1\21\1\22\1\6\1\15\7\14\1\26\1\13\1\43\1\44\1\53\1\46\1\55"+ @@ -122,44 +124,45 @@ public static int ZZ_CMAP(int ch) { "\0\1\10\1\0\4\10\1\0\23\10\1\0\13\10\10\0\6\10\1\0\26\10\2\0\1\10\6\0\10\10"+ "\10\0\13\10\5\0\3\10\15\0\12\11\4\0\6\10\1\0\1\10\17\0\2\10\7\0\2\10\12\11"+ "\3\10\2\0\2\10\1\0\16\10\15\0\11\10\13\0\1\10\16\0\12\11\6\10\4\0\2\10\4\0"+ - "\1\10\5\0\6\10\4\0\1\10\11\0\1\10\3\0\1\10\7\0\11\10\7\0\5\10\17\0\26\10\3"+ - "\0\1\10\2\0\1\10\7\0\12\10\4\0\12\11\1\10\4\0\10\10\2\0\2\10\2\0\26\10\1\0"+ - "\7\10\1\0\1\10\3\0\4\10\3\0\1\10\20\0\1\10\15\0\2\10\1\0\1\10\5\0\6\10\4\0"+ - "\2\10\1\0\2\10\1\0\2\10\1\0\2\10\17\0\4\10\1\0\1\10\7\0\12\11\2\0\3\10\20"+ - "\0\11\10\1\0\2\10\1\0\2\10\1\0\5\10\3\0\1\10\2\0\1\10\30\0\1\10\13\0\10\10"+ - "\2\0\1\10\3\0\1\10\1\0\6\10\3\0\3\10\1\0\4\10\3\0\2\10\1\0\1\10\1\0\2\10\3"+ - "\0\2\10\3\0\3\10\3\0\14\10\13\0\10\10\1\0\2\10\10\0\3\10\5\0\4\10\1\0\5\10"+ - "\3\0\1\10\3\0\2\10\15\0\13\10\2\0\1\10\21\0\1\10\12\0\6\10\5\0\22\10\3\0\10"+ - "\10\1\0\11\10\1\0\1\10\2\0\7\10\11\0\1\10\1\0\2\10\14\0\12\11\7\0\2\10\1\0"+ - "\1\10\2\0\2\10\1\0\1\10\2\0\1\10\6\0\4\10\1\0\7\10\1\0\3\10\1\0\1\10\1\0\1"+ - "\10\2\0\2\10\1\0\4\10\1\0\2\10\11\0\1\10\2\0\5\10\1\0\1\10\11\0\12\11\2\0"+ - "\14\10\1\0\24\10\13\0\5\10\3\0\6\10\4\0\4\10\3\0\1\10\3\0\2\10\7\0\3\10\4"+ - "\0\15\10\14\0\1\10\1\0\6\10\1\0\1\10\5\0\1\10\2\0\13\10\1\0\15\10\1\0\4\10"+ - "\2\0\7\10\1\0\1\10\1\0\4\10\2\0\1\10\1\0\4\10\2\0\7\10\1\0\1\10\1\0\4\10\2"+ - "\0\16\10\2\0\6\10\2\0\15\10\2\0\1\10\1\0\10\10\7\0\15\10\1\0\6\10\23\0\1\10"+ - "\4\0\1\10\3\0\11\10\1\0\1\10\5\0\17\10\1\0\16\10\2\0\14\10\13\0\1\10\15\0"+ - "\7\10\7\0\16\10\15\0\2\10\12\11\3\0\3\10\11\0\4\10\1\0\4\10\3\0\2\10\11\0"+ - "\10\10\1\0\1\10\1\0\1\10\1\0\1\10\1\0\6\10\1\0\7\10\1\0\1\10\3\0\3\10\1\0"+ - "\7\10\3\0\4\10\2\0\6\10\14\0\2\1\7\0\1\10\15\0\1\10\2\0\1\10\4\0\1\10\2\0"+ - "\12\10\1\0\1\10\3\0\5\10\6\0\1\10\1\0\1\10\1\0\1\10\1\0\4\10\1\0\13\10\2\0"+ - "\4\10\5\0\5\10\4\0\1\10\4\0\2\10\13\0\5\10\6\0\4\10\3\0\2\10\14\0\10\10\7"+ - "\0\10\10\1\0\7\10\6\0\2\10\12\0\5\10\5\0\2\10\3\0\7\10\6\0\3\10\12\11\2\10"+ - "\13\0\11\10\2\0\27\10\2\0\7\10\1\0\3\10\1\0\4\10\1\0\4\10\2\0\6\10\3\0\1\10"+ - "\1\0\1\10\2\0\5\10\1\0\12\10\12\11\5\10\1\0\3\10\1\0\10\10\4\0\7\10\3\0\1"+ - "\10\3\0\2\10\1\0\1\10\3\0\2\10\2\0\5\10\2\0\1\10\1\0\1\10\30\0\3\10\3\0\6"+ - "\10\2\0\6\10\2\0\6\10\11\0\7\10\4\0\5\10\3\0\5\10\5\0\1\10\1\0\10\10\1\0\5"+ - "\10\1\0\1\10\1\0\2\10\1\0\2\10\1\0\12\10\6\0\12\10\2\0\6\10\2\0\6\10\2\0\6"+ - "\10\2\0\3\10\3\0\14\10\1\0\16\10\1\0\2\10\1\0\2\10\1\0\10\10\6\0\4\10\4\0"+ - "\16\10\2\0\1\10\1\0\14\10\1\0\2\10\3\0\1\10\2\0\4\10\1\0\2\10\12\0\10\10\6"+ - "\0\6\10\1\0\3\10\1\0\12\10\3\0\1\10\12\0\4\10\13\0\12\11\1\10\1\0\1\10\3\0"+ - "\7\10\1\0\1\10\1\0\4\10\1\0\17\10\1\0\2\10\14\0\3\10\4\0\2\10\1\0\1\10\20"+ - "\0\4\10\10\0\1\10\13\0\10\10\5\0\3\10\2\0\1\10\2\0\2\10\2\0\4\10\1\0\14\10"+ - "\1\0\1\10\1\0\7\10\1\0\21\10\1\0\4\10\2\0\10\10\1\0\7\10\1\0\14\10\1\0\4\10"+ - "\1\0\5\10\1\0\1\10\3\0\14\10\2\0\13\10\1\0\10\10\2\0\22\11\1\0\2\10\1\0\1"+ - "\10\2\0\1\10\1\0\12\10\1\0\4\10\1\0\1\10\1\0\1\10\6\0\1\10\4\0\1\10\1\0\1"+ - "\10\1\0\1\10\1\0\3\10\1\0\2\10\1\0\1\10\2\0\1\10\1\0\1\10\1\0\1\10\1\0\1\10"+ - "\1\0\1\10\1\0\2\10\1\0\1\10\2\0\4\10\1\0\7\10\1\0\4\10\1\0\4\10\1\0\1\10\1"+ - "\0\12\10\1\0\5\10\1\0\3\10\1\0\5\10\1\0\5\10"); + "\1\10\5\0\6\10\4\0\1\10\11\0\1\10\3\0\1\10\7\0\11\10\7\0\5\10\1\0\10\10\6"+ + "\0\26\10\3\0\1\10\2\0\1\10\7\0\12\10\4\0\12\11\1\10\4\0\10\10\2\0\2\10\2\0"+ + "\26\10\1\0\7\10\1\0\1\10\3\0\4\10\3\0\1\10\20\0\1\10\15\0\2\10\1\0\1\10\5"+ + "\0\6\10\4\0\2\10\1\0\2\10\1\0\2\10\1\0\2\10\17\0\4\10\1\0\1\10\7\0\12\11\2"+ + "\0\3\10\20\0\11\10\1\0\2\10\1\0\2\10\1\0\5\10\3\0\1\10\2\0\1\10\30\0\1\10"+ + "\13\0\10\10\2\0\1\10\3\0\1\10\1\0\6\10\3\0\3\10\1\0\4\10\3\0\2\10\1\0\1\10"+ + "\1\0\2\10\3\0\2\10\3\0\3\10\3\0\14\10\13\0\10\10\1\0\2\10\10\0\3\10\5\0\1"+ + "\10\4\0\10\10\1\0\6\10\1\0\5\10\3\0\1\10\3\0\2\10\15\0\13\10\2\0\1\10\6\0"+ + "\3\10\10\0\1\10\12\0\6\10\5\0\22\10\3\0\10\10\1\0\11\10\1\0\1\10\2\0\7\10"+ + "\11\0\1\10\1\0\2\10\14\0\12\11\7\0\2\10\1\0\1\10\2\0\2\10\1\0\1\10\2\0\1\10"+ + "\6\0\4\10\1\0\7\10\1\0\3\10\1\0\1\10\1\0\1\10\2\0\2\10\1\0\4\10\1\0\2\10\11"+ + "\0\1\10\2\0\5\10\1\0\1\10\11\0\12\11\2\0\14\10\1\0\24\10\13\0\5\10\22\0\7"+ + "\10\4\0\4\10\3\0\1\10\3\0\2\10\7\0\3\10\4\0\15\10\14\0\1\10\1\0\6\10\1\0\1"+ + "\10\5\0\1\10\2\0\13\10\1\0\15\10\1\0\4\10\2\0\7\10\1\0\1\10\1\0\4\10\2\0\1"+ + "\10\1\0\4\10\2\0\7\10\1\0\1\10\1\0\4\10\2\0\16\10\2\0\6\10\2\0\15\10\2\0\1"+ + "\10\1\0\10\10\7\0\15\10\1\0\6\10\23\0\1\10\4\0\1\10\3\0\5\10\2\0\22\10\1\0"+ + "\1\10\5\0\17\10\1\0\16\10\2\0\5\10\13\0\14\10\13\0\1\10\15\0\7\10\7\0\16\10"+ + "\15\0\2\10\12\11\3\0\3\10\11\0\4\10\1\0\4\10\3\0\2\10\11\0\10\10\1\0\1\10"+ + "\1\0\1\10\1\0\1\10\1\0\6\10\1\0\7\10\1\0\1\10\3\0\3\10\1\0\7\10\3\0\4\10\2"+ + "\0\6\10\14\0\2\1\7\0\1\10\15\0\1\10\2\0\1\10\4\0\1\10\2\0\12\10\1\0\1\10\3"+ + "\0\5\10\6\0\1\10\1\0\1\10\1\0\1\10\1\0\4\10\1\0\13\10\2\0\4\10\5\0\5\10\4"+ + "\0\1\10\4\0\2\10\13\0\5\10\6\0\4\10\3\0\2\10\14\0\10\10\7\0\10\10\1\0\7\10"+ + "\6\0\2\10\12\0\5\10\5\0\2\10\3\0\7\10\6\0\3\10\12\11\2\10\13\0\11\10\2\0\27"+ + "\10\2\0\7\10\1\0\3\10\1\0\4\10\1\0\4\10\2\0\6\10\3\0\1\10\1\0\1\10\2\0\5\10"+ + "\1\0\12\10\12\11\5\10\1\0\3\10\1\0\10\10\4\0\7\10\3\0\1\10\3\0\2\10\1\0\1"+ + "\10\3\0\2\10\2\0\5\10\2\0\1\10\1\0\1\10\30\0\3\10\3\0\6\10\2\0\6\10\2\0\6"+ + "\10\11\0\7\10\4\0\5\10\3\0\5\10\5\0\1\10\1\0\10\10\1\0\5\10\1\0\1\10\1\0\2"+ + "\10\1\0\2\10\1\0\12\10\6\0\12\10\2\0\6\10\2\0\6\10\2\0\6\10\2\0\3\10\3\0\14"+ + "\10\1\0\16\10\1\0\2\10\1\0\2\10\1\0\10\10\6\0\4\10\4\0\16\10\2\0\1\10\1\0"+ + "\14\10\1\0\2\10\3\0\1\10\2\0\4\10\1\0\2\10\12\0\10\10\6\0\6\10\1\0\3\10\1"+ + "\0\12\10\3\0\1\10\12\0\4\10\13\0\12\11\1\10\1\0\1\10\3\0\7\10\1\0\1\10\1\0"+ + "\4\10\1\0\17\10\1\0\2\10\14\0\3\10\7\0\4\10\11\0\2\10\1\0\1\10\20\0\4\10\10"+ + "\0\1\10\13\0\10\10\5\0\3\10\2\0\1\10\2\0\2\10\2\0\4\10\1\0\14\10\1\0\1\10"+ + "\1\0\7\10\1\0\21\10\1\0\4\10\2\0\10\10\1\0\7\10\1\0\14\10\1\0\4\10\1\0\5\10"+ + "\1\0\1\10\3\0\14\10\2\0\13\10\1\0\10\10\2\0\22\11\1\0\2\10\1\0\1\10\2\0\1"+ + "\10\1\0\12\10\1\0\4\10\1\0\1\10\1\0\1\10\6\0\1\10\4\0\1\10\1\0\1\10\1\0\1"+ + "\10\1\0\3\10\1\0\2\10\1\0\1\10\2\0\1\10\1\0\1\10\1\0\1\10\1\0\1\10\1\0\1\10"+ + "\1\0\2\10\1\0\1\10\2\0\4\10\1\0\7\10\1\0\4\10\1\0\4\10\1\0\1\10\1\0\12\10"+ + "\1\0\5\10\1\0\3\10\1\0\5\10\1\0\5\10"); /** * Translates DFA states to action switch labels. @@ -651,7 +654,7 @@ public final int yylength() { /** - * Reports an error that occured while scanning. + * Reports an error that occurred while scanning. * * In a wellformed scanner (no or only correct usage of * yypushback(int) and a match-all fallback rule) this method @@ -785,363 +788,453 @@ else if (zzAtEOF) { switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { case 1: { return BAD_CHARACTER; - } + } + // fall through case 91: break; case 2: { return NLS; - } + } + // fall through case 92: break; case 3: { return WS; - } + } + // fall through case 93: break; case 4: { return QUOTIENT; - } + } + // fall through case 94: break; case 5: { return MUL; - } + } + // fall through case 95: break; case 6: { yybegin(MAYBE_SEMICOLON); return IDENTIFIER; - } + } + // fall through case 96: break; case 7: { yybegin(MAYBE_SEMICOLON); return INT; - } + } + // fall through case 97: break; case 8: { return MINUS; - } + } + // fall through case 98: break; case 9: { return DOT; - } + } + // fall through case 99: break; case 10: { yybegin(MAYBE_SEMICOLON); return STRING; - } + } + // fall through case 100: break; case 11: { yybegin(MAYBE_SEMICOLON); return RAW_STRING; - } + } + // fall through case 101: break; case 12: { return BIT_OR; - } + } + // fall through case 102: break; case 13: { return LBRACE; - } + } + // fall through case 103: break; case 14: { yybegin(MAYBE_SEMICOLON); return RBRACE; - } + } + // fall through case 104: break; case 15: { return LBRACK; - } + } + // fall through case 105: break; case 16: { yybegin(MAYBE_SEMICOLON); return RBRACK; - } + } + // fall through case 106: break; case 17: { return LPAREN; - } + } + // fall through case 107: break; case 18: { yybegin(MAYBE_SEMICOLON); return RPAREN; - } + } + // fall through case 108: break; case 19: { return COLON; - } + } + // fall through case 109: break; case 20: { return SEMICOLON; - } + } + // fall through case 110: break; case 21: { return COMMA; - } + } + // fall through case 111: break; case 22: { return ASSIGN; - } + } + // fall through case 112: break; case 23: { return NOT; - } + } + // fall through case 113: break; case 24: { return PLUS; - } + } + // fall through case 114: break; case 25: { return BIT_AND; - } + } + // fall through case 115: break; case 26: { return BIT_XOR; - } + } + // fall through case 116: break; case 27: { return LESS; - } + } + // fall through case 117: break; case 28: { return REMAINDER; - } + } + // fall through case 118: break; case 29: { return GREATER; - } + } + // fall through case 119: break; case 30: { yybegin(YYINITIAL); yypushback(yytext().length()); - } + } + // fall through case 120: break; case 31: { yybegin(YYINITIAL); yypushback(yytext().length()); return SEMICOLON_SYNTHETIC; - } + } + // fall through case 121: break; case 32: { return LINE_COMMENT; - } + } + // fall through case 122: break; case 33: { return MULTILINE_COMMENT; - } + } + // fall through case 123: break; case 34: { return QUOTIENT_ASSIGN; - } + } + // fall through case 124: break; case 35: { return MUL_ASSIGN; - } + } + // fall through case 125: break; case 36: { yybegin(MAYBE_SEMICOLON); return FLOAT; - } + } + // fall through case 126: break; case 37: { yybegin(MAYBE_SEMICOLON); return DECIMALI; - } + } + // fall through case 127: break; case 38: { yybegin(MAYBE_SEMICOLON); return OCT; - } + } + // fall through case 128: break; case 39: { yybegin(MAYBE_SEMICOLON); return MINUS_MINUS; - } + } + // fall through case 129: break; case 40: { return MINUS_ASSIGN; - } + } + // fall through case 130: break; case 41: { yybegin(MAYBE_SEMICOLON); return CHAR; - } + } + // fall through case 131: break; case 42: { return COND_OR; - } + } + // fall through case 132: break; case 43: { return BIT_OR_ASSIGN; - } + } + // fall through case 133: break; case 44: { return VAR_ASSIGN; - } + } + // fall through case 134: break; case 45: { return EQ; - } + } + // fall through case 135: break; case 46: { return NOT_EQ; - } + } + // fall through case 136: break; case 47: { return PLUS_ASSIGN; - } + } + // fall through case 137: break; case 48: { yybegin(MAYBE_SEMICOLON); return PLUS_PLUS; - } + } + // fall through case 138: break; case 49: { return BIT_AND_ASSIGN; - } + } + // fall through case 139: break; case 50: { return COND_AND; - } + } + // fall through case 140: break; case 51: { return BIT_CLEAR; - } + } + // fall through case 141: break; case 52: { return BIT_XOR_ASSIGN; - } + } + // fall through case 142: break; case 53: { return SEND_CHANNEL; - } + } + // fall through case 143: break; case 54: { return LESS_OR_EQUAL; - } + } + // fall through case 144: break; case 55: { return SHIFT_LEFT; - } + } + // fall through case 145: break; case 56: { return REMAINDER_ASSIGN; - } + } + // fall through case 146: break; case 57: { return GREATER_OR_EQUAL; - } + } + // fall through case 147: break; case 58: { return SHIFT_RIGHT; - } + } + // fall through case 148: break; case 59: { return GO; - } + } + // fall through case 149: break; case 60: { return IF ; - } + } + // fall through case 150: break; case 61: { yybegin(MAYBE_SEMICOLON); return FLOATI; - } + } + // fall through case 151: break; case 62: { yybegin(MAYBE_SEMICOLON); return HEX; - } + } + // fall through case 152: break; case 63: { return TRIPLE_DOT; - } + } + // fall through case 153: break; case 64: { return VAR; - } + } + // fall through case 154: break; case 65: { return FOR ; - } + } + // fall through case 155: break; case 66: { yybegin(MAYBE_SEMICOLON); return BAD_CHARACTER; - } + } + // fall through case 156: break; case 67: { return BIT_CLEAR_ASSIGN; - } + } + // fall through case 157: break; case 68: { return SHIFT_LEFT_ASSIGN; - } + } + // fall through case 158: break; case 69: { return SHIFT_RIGHT_ASSIGN; - } + } + // fall through case 159: break; case 70: { return MAP; - } + } + // fall through case 160: break; case 71: { return FUNC; - } + } + // fall through case 161: break; case 72: { return ELSE; - } + } + // fall through case 162: break; case 73: { return TYPE_; - } + } + // fall through case 163: break; case 74: { return GOTO; - } + } + // fall through case 164: break; case 75: { return CASE; - } + } + // fall through case 165: break; case 76: { return CHAN; - } + } + // fall through case 166: break; case 77: { yybegin(MAYBE_SEMICOLON); return BREAK; - } + } + // fall through case 167: break; case 78: { return RANGE; - } + } + // fall through case 168: break; case 79: { return CONST; - } + } + // fall through case 169: break; case 80: { return DEFER; - } + } + // fall through case 170: break; case 81: { yybegin(MAYBE_SEMICOLON); return RETURN ; - } + } + // fall through case 171: break; case 82: { return IMPORT ; - } + } + // fall through case 172: break; case 83: { return SELECT; - } + } + // fall through case 173: break; case 84: { return STRUCT; - } + } + // fall through case 174: break; case 85: { return SWITCH; - } + } + // fall through case 175: break; case 86: { return DEFAULT; - } + } + // fall through case 176: break; case 87: { return PACKAGE; - } + } + // fall through case 177: break; case 88: { yybegin(MAYBE_SEMICOLON); return CONTINUE ; - } + } + // fall through case 178: break; case 89: { return INTERFACE; - } + } + // fall through case 179: break; case 90: { yybegin(MAYBE_SEMICOLON); return FALLTHROUGH; - } + } + // fall through case 180: break; default: zzScanError(ZZ_NO_MATCH); diff --git a/src/main/gen/com/notzippy/intellij/go/lexer/_GoLexer.java~ b/src/main/gen/com/notzippy/intellij/go/lexer/_GoLexer.java~ new file mode 100644 index 0000000000..c443c488db --- /dev/null +++ b/src/main/gen/com/notzippy/intellij/go/lexer/_GoLexer.java~ @@ -0,0 +1,1247 @@ +/* The following code was generated by JFlex 1.7.0 tweaked for IntelliJ platform */ + +package com.notzippy.intellij.go.lexer; + +import com.intellij.lexer.FlexLexer; +import com.intellij.psi.tree.IElementType; +import com.notzippy.intellij.go.parser.GoTypes; +import static com.intellij.psi.TokenType.BAD_CHARACTER; +import static com.notzippy.intellij.go.intellij.GoParserDefinition.*; + + +/** + * This class is a scanner generated by + * JFlex 1.7.0 + * from the specification file go.flex + */ +public class _GoLexer implements FlexLexer, GoTypes { + + /** This character denotes the end of file */ + public static final int YYEOF = -1; + + /** initial size of the lookahead buffer */ + private static final int ZZ_BUFFERSIZE = 16384; + + /** lexical states */ + public static final int YYINITIAL = 0; + public static final int MAYBE_SEMICOLON = 2; + + /** + * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l + * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l + * at the beginning of a line + * l is of the form l = 2*k, k a non negative integer + */ + private static final int ZZ_LEXSTATE[] = { + 0, 0, 1, 1 + }; + + /** + * Translates characters to character classes + * Chosen bits are [11, 6, 4] + * Total runtime size is 14336 bytes + */ + public static int ZZ_CMAP(int ch) { + return ZZ_CMAP_A[(ZZ_CMAP_Y[(ZZ_CMAP_Z[ch>>10]<<6)|((ch>>4)&0x3f)]<<4)|(ch&0xf)]; + } + + /* The ZZ_CMAP_Z table has 1088 entries */ + static final char ZZ_CMAP_Z[] = zzUnpackCMap( + "\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\2\11\1\12\1\13\6\14\1\15\23\14\1\16"+ + "\1\14\1\17\1\20\12\14\1\21\10\11\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1"+ + "\32\1\33\1\34\1\35\2\11\1\14\1\36\3\11\1\37\10\11\1\40\1\41\5\14\1\42\1\43"+ + "\11\11\1\44\2\11\1\45\5\11\1\46\4\11\1\47\1\50\4\11\51\14\1\51\3\14\1\52\1"+ + "\53\4\14\1\54\12\11\1\55\u0381\11"); + + /* The ZZ_CMAP_Y table has 2944 entries */ + static final char ZZ_CMAP_Y[] = zzUnpackCMap( + "\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\1\1\11\1\12\1\13\1\14\1\13\1\14\34"+ + "\13\1\15\1\16\1\17\10\1\1\20\1\21\1\13\1\22\4\13\1\23\10\13\1\24\12\13\1\25"+ + "\1\13\1\26\1\25\1\13\1\27\4\1\1\13\1\30\1\31\2\1\2\13\1\30\1\1\1\32\1\25\5"+ + "\13\1\33\1\34\1\35\1\1\1\36\1\13\1\1\1\37\5\13\1\40\1\41\1\42\1\13\1\30\1"+ + "\43\1\13\1\44\1\45\1\1\1\13\1\46\4\1\1\13\1\47\4\1\1\50\2\13\1\51\1\1\1\52"+ + "\1\53\1\25\1\54\1\55\1\56\1\57\1\60\1\61\1\53\1\16\1\62\1\55\1\56\1\63\1\1"+ + "\1\64\1\65\1\66\1\67\1\22\1\56\1\70\1\1\1\71\1\53\1\72\1\73\1\55\1\56\1\70"+ + "\1\1\1\61\1\53\1\41\1\74\1\75\1\76\1\77\1\1\1\71\1\65\1\1\1\100\1\36\1\56"+ + "\1\51\1\1\1\101\1\53\1\1\1\102\1\36\1\56\1\103\1\1\1\60\1\53\1\104\1\100\1"+ + "\36\1\13\1\105\1\60\1\106\1\53\1\107\1\110\1\111\1\13\1\112\1\113\1\1\1\65"+ + "\1\1\1\25\2\13\1\114\1\113\1\115\2\1\1\116\1\117\1\120\1\121\1\122\1\123\2"+ + "\1\1\71\1\1\1\115\1\1\1\124\1\13\1\125\1\1\1\126\7\1\2\13\1\30\1\127\1\115"+ + "\1\130\1\131\1\132\1\133\1\115\2\13\1\134\2\13\1\135\24\13\1\136\1\137\2\13"+ + "\1\136\2\13\1\140\1\141\1\14\3\13\1\141\3\13\1\30\2\1\1\13\1\1\5\13\1\142"+ + "\1\25\45\13\1\143\1\13\1\25\1\30\4\13\1\30\1\144\1\145\1\16\1\13\1\16\1\13"+ + "\1\16\1\145\1\71\3\13\1\146\1\1\1\147\1\115\2\1\1\115\5\13\1\27\1\150\1\13"+ + "\1\151\4\13\1\40\1\13\1\152\2\1\1\65\1\13\1\153\1\154\2\13\1\155\1\13\1\77"+ + "\1\115\2\1\1\13\1\113\3\13\1\154\2\1\2\115\1\156\5\1\1\110\2\13\1\146\1\157"+ + "\1\115\2\1\1\160\1\13\1\161\1\42\2\13\1\40\1\1\2\13\1\146\1\1\1\162\1\42\1"+ + "\13\1\153\1\46\5\1\1\163\1\164\14\13\4\1\21\13\1\142\2\13\1\142\1\165\1\13"+ + "\1\153\3\13\1\166\1\167\1\170\1\125\1\167\2\1\1\171\4\1\1\172\1\1\1\125\6"+ + "\1\1\173\1\174\1\175\1\176\1\177\3\1\1\200\147\1\2\13\1\152\2\13\1\152\10"+ + "\13\1\201\1\202\2\13\1\134\3\13\1\203\1\1\1\13\1\113\4\204\4\1\1\127\35\1"+ + "\1\205\2\1\1\206\1\25\4\13\1\207\1\25\4\13\1\135\1\110\1\13\1\153\1\25\4\13"+ + "\1\152\1\1\1\13\1\30\3\1\1\13\40\1\133\13\1\40\4\1\135\13\1\40\2\1\10\13\1"+ + "\125\4\1\2\13\1\153\20\13\1\125\1\13\1\210\1\1\2\13\1\152\1\127\1\13\1\153"+ + "\4\13\1\40\2\1\1\211\1\212\5\13\1\213\1\13\1\152\1\27\3\1\1\211\1\214\1\13"+ + "\1\31\1\1\3\13\1\146\1\212\2\13\1\146\1\1\1\115\1\1\1\215\1\42\1\13\1\40\1"+ + "\13\1\113\1\1\1\13\1\125\1\50\2\13\1\31\1\127\1\115\1\216\1\217\2\13\1\46"+ + "\1\1\1\220\1\115\1\13\1\221\3\13\1\222\1\223\1\224\1\30\1\66\1\225\1\226\1"+ + "\204\2\13\1\135\1\40\7\13\1\31\1\115\72\13\1\146\1\13\1\227\2\13\1\155\20"+ + "\1\26\13\1\153\6\13\1\77\2\1\1\113\1\230\1\56\1\231\1\232\6\13\1\16\1\1\1"+ + "\160\25\13\1\153\1\1\4\13\1\212\2\13\1\27\2\1\1\155\7\1\1\216\7\13\1\125\1"+ + "\1\1\115\1\25\1\30\1\25\1\30\1\233\4\13\1\152\1\234\1\235\2\1\1\236\1\13\1"+ + "\14\1\237\2\153\2\1\7\13\1\30\30\1\1\13\1\125\3\13\1\71\2\1\2\13\1\1\1\13"+ + "\1\240\2\13\1\40\1\13\1\153\2\13\1\241\3\1\11\13\1\153\1\115\2\13\1\241\1"+ + "\13\1\155\2\13\1\27\3\13\1\146\11\1\23\13\1\113\1\13\1\40\1\27\11\1\1\242"+ + "\2\13\1\243\1\13\1\40\1\13\1\113\1\13\1\152\4\1\1\13\1\244\1\13\1\40\1\13"+ + "\1\77\4\1\3\13\1\245\4\1\1\71\1\246\1\13\1\146\2\1\1\13\1\125\1\13\1\125\2"+ + "\1\1\124\1\13\1\154\1\1\3\13\1\40\1\13\1\40\1\13\1\31\1\13\1\16\6\1\4\13\1"+ + "\46\3\1\3\13\1\31\3\13\1\31\60\1\1\160\2\13\1\27\2\1\1\65\1\1\1\160\2\13\2"+ + "\1\1\13\1\46\1\115\1\160\1\13\1\113\1\65\1\1\2\13\1\247\1\160\2\13\1\31\1"+ + "\250\1\251\2\1\1\13\1\22\1\155\5\1\1\252\1\253\1\46\2\13\1\152\1\1\1\115\1"+ + "\73\1\55\1\56\1\70\1\1\1\254\1\16\11\1\3\13\1\154\1\255\1\115\2\1\3\13\1\1"+ + "\1\256\1\115\12\1\2\13\1\152\2\1\1\257\2\1\3\13\1\1\1\260\1\115\2\1\2\13\1"+ + "\30\1\1\1\115\3\1\1\13\1\77\1\1\1\115\26\1\4\13\1\115\1\127\34\1\3\13\1\46"+ + "\20\1\1\56\1\13\1\152\1\1\1\71\1\115\1\1\1\212\1\13\67\1\71\13\1\77\16\1\14"+ + "\13\1\146\53\1\2\13\1\152\75\1\44\13\1\113\33\1\43\13\1\46\1\13\1\152\1\115"+ + "\6\1\1\13\1\153\1\1\3\13\1\1\1\146\1\115\1\160\1\261\1\13\67\1\4\13\1\154"+ + "\1\71\3\1\1\160\4\1\1\71\1\1\76\13\1\125\1\1\57\13\1\31\20\1\1\16\77\1\6\13"+ + "\1\30\1\125\1\46\1\77\66\1\5\13\1\216\3\13\1\145\1\262\1\263\1\264\3\13\1"+ + "\265\1\266\1\13\1\267\1\270\1\36\24\13\1\271\1\13\1\36\1\135\1\13\1\135\1"+ + "\13\1\216\1\13\1\216\1\152\1\13\1\152\1\13\1\56\1\13\1\56\1\13\1\272\3\273"+ + "\14\13\1\154\3\1\4\13\1\146\1\115\112\1\1\264\1\13\1\274\1\275\1\276\1\277"+ + "\1\300\1\301\1\302\1\155\1\303\1\155\24\1\55\13\1\113\2\1\103\13\1\154\15"+ + "\13\1\153\150\13\1\16\25\1\41\13\1\153\36\1"); + + /* The ZZ_CMAP_A table has 3136 entries */ + static final char ZZ_CMAP_A[] = zzUnpackCMap( + "\11\0\1\4\1\2\1\1\1\5\1\3\22\0\1\4\1\47\1\23\2\0\1\54\1\51\1\31\1\41\1\42"+ + "\1\7\1\50\1\45\1\21\1\22\1\6\1\15\7\14\1\26\1\13\1\43\1\44\1\53\1\46\1\55"+ + "\2\0\4\12\1\20\1\12\16\10\1\25\2\10\1\17\2\10\1\37\1\24\1\40\1\52\1\10\1\33"+ + "\1\61\1\56\1\71\1\73\1\60\1\30\1\67\1\65\1\72\1\10\1\62\1\63\1\76\1\70\1\66"+ + "\1\74\1\10\1\57\1\75\1\64\1\32\1\27\1\77\1\16\1\100\1\10\1\35\1\34\1\36\7"+ + "\0\1\1\24\0\1\10\12\0\1\10\4\0\1\10\5\0\27\10\1\0\12\10\4\0\14\10\16\0\5\10"+ + "\7\0\1\10\1\0\1\10\1\0\5\10\1\0\2\10\2\0\4\10\1\0\1\10\6\0\1\10\1\0\3\10\1"+ + "\0\1\10\1\0\4\10\1\0\23\10\1\0\13\10\10\0\6\10\1\0\26\10\2\0\1\10\6\0\10\10"+ + "\10\0\13\10\5\0\3\10\15\0\12\11\4\0\6\10\1\0\1\10\17\0\2\10\7\0\2\10\12\11"+ + "\3\10\2\0\2\10\1\0\16\10\15\0\11\10\13\0\1\10\16\0\12\11\6\10\4\0\2\10\4\0"+ + "\1\10\5\0\6\10\4\0\1\10\11\0\1\10\3\0\1\10\7\0\11\10\7\0\5\10\1\0\10\10\6"+ + "\0\26\10\3\0\1\10\2\0\1\10\7\0\12\10\4\0\12\11\1\10\4\0\10\10\2\0\2\10\2\0"+ + "\26\10\1\0\7\10\1\0\1\10\3\0\4\10\3\0\1\10\20\0\1\10\15\0\2\10\1\0\1\10\5"+ + "\0\6\10\4\0\2\10\1\0\2\10\1\0\2\10\1\0\2\10\17\0\4\10\1\0\1\10\7\0\12\11\2"+ + "\0\3\10\20\0\11\10\1\0\2\10\1\0\2\10\1\0\5\10\3\0\1\10\2\0\1\10\30\0\1\10"+ + "\13\0\10\10\2\0\1\10\3\0\1\10\1\0\6\10\3\0\3\10\1\0\4\10\3\0\2\10\1\0\1\10"+ + "\1\0\2\10\3\0\2\10\3\0\3\10\3\0\14\10\13\0\10\10\1\0\2\10\10\0\3\10\5\0\1"+ + "\10\4\0\10\10\1\0\6\10\1\0\5\10\3\0\1\10\3\0\2\10\15\0\13\10\2\0\1\10\6\0"+ + "\3\10\10\0\1\10\12\0\6\10\5\0\22\10\3\0\10\10\1\0\11\10\1\0\1\10\2\0\7\10"+ + "\11\0\1\10\1\0\2\10\14\0\12\11\7\0\2\10\1\0\1\10\2\0\2\10\1\0\1\10\2\0\1\10"+ + "\6\0\4\10\1\0\7\10\1\0\3\10\1\0\1\10\1\0\1\10\2\0\2\10\1\0\4\10\1\0\2\10\11"+ + "\0\1\10\2\0\5\10\1\0\1\10\11\0\12\11\2\0\14\10\1\0\24\10\13\0\5\10\22\0\7"+ + "\10\4\0\4\10\3\0\1\10\3\0\2\10\7\0\3\10\4\0\15\10\14\0\1\10\1\0\6\10\1\0\1"+ + "\10\5\0\1\10\2\0\13\10\1\0\15\10\1\0\4\10\2\0\7\10\1\0\1\10\1\0\4\10\2\0\1"+ + "\10\1\0\4\10\2\0\7\10\1\0\1\10\1\0\4\10\2\0\16\10\2\0\6\10\2\0\15\10\2\0\1"+ + "\10\1\0\10\10\7\0\15\10\1\0\6\10\23\0\1\10\4\0\1\10\3\0\5\10\2\0\22\10\1\0"+ + "\1\10\5\0\17\10\1\0\16\10\2\0\5\10\13\0\14\10\13\0\1\10\15\0\7\10\7\0\16\10"+ + "\15\0\2\10\12\11\3\0\3\10\11\0\4\10\1\0\4\10\3\0\2\10\11\0\10\10\1\0\1\10"+ + "\1\0\1\10\1\0\1\10\1\0\6\10\1\0\7\10\1\0\1\10\3\0\3\10\1\0\7\10\3\0\4\10\2"+ + "\0\6\10\14\0\2\1\7\0\1\10\15\0\1\10\2\0\1\10\4\0\1\10\2\0\12\10\1\0\1\10\3"+ + "\0\5\10\6\0\1\10\1\0\1\10\1\0\1\10\1\0\4\10\1\0\13\10\2\0\4\10\5\0\5\10\4"+ + "\0\1\10\4\0\2\10\13\0\5\10\6\0\4\10\3\0\2\10\14\0\10\10\7\0\10\10\1\0\7\10"+ + "\6\0\2\10\12\0\5\10\5\0\2\10\3\0\7\10\6\0\3\10\12\11\2\10\13\0\11\10\2\0\27"+ + "\10\2\0\7\10\1\0\3\10\1\0\4\10\1\0\4\10\2\0\6\10\3\0\1\10\1\0\1\10\2\0\5\10"+ + "\1\0\12\10\12\11\5\10\1\0\3\10\1\0\10\10\4\0\7\10\3\0\1\10\3\0\2\10\1\0\1"+ + "\10\3\0\2\10\2\0\5\10\2\0\1\10\1\0\1\10\30\0\3\10\3\0\6\10\2\0\6\10\2\0\6"+ + "\10\11\0\7\10\4\0\5\10\3\0\5\10\5\0\1\10\1\0\10\10\1\0\5\10\1\0\1\10\1\0\2"+ + "\10\1\0\2\10\1\0\12\10\6\0\12\10\2\0\6\10\2\0\6\10\2\0\6\10\2\0\3\10\3\0\14"+ + "\10\1\0\16\10\1\0\2\10\1\0\2\10\1\0\10\10\6\0\4\10\4\0\16\10\2\0\1\10\1\0"+ + "\14\10\1\0\2\10\3\0\1\10\2\0\4\10\1\0\2\10\12\0\10\10\6\0\6\10\1\0\3\10\1"+ + "\0\12\10\3\0\1\10\12\0\4\10\13\0\12\11\1\10\1\0\1\10\3\0\7\10\1\0\1\10\1\0"+ + "\4\10\1\0\17\10\1\0\2\10\14\0\3\10\7\0\4\10\11\0\2\10\1\0\1\10\20\0\4\10\10"+ + "\0\1\10\13\0\10\10\5\0\3\10\2\0\1\10\2\0\2\10\2\0\4\10\1\0\14\10\1\0\1\10"+ + "\1\0\7\10\1\0\21\10\1\0\4\10\2\0\10\10\1\0\7\10\1\0\14\10\1\0\4\10\1\0\5\10"+ + "\1\0\1\10\3\0\14\10\2\0\13\10\1\0\10\10\2\0\22\11\1\0\2\10\1\0\1\10\2\0\1"+ + "\10\1\0\12\10\1\0\4\10\1\0\1\10\1\0\1\10\6\0\1\10\4\0\1\10\1\0\1\10\1\0\1"+ + "\10\1\0\3\10\1\0\2\10\1\0\1\10\2\0\1\10\1\0\1\10\1\0\1\10\1\0\1\10\1\0\1\10"+ + "\1\0\2\10\1\0\1\10\2\0\4\10\1\0\7\10\1\0\4\10\1\0\4\10\1\0\1\10\1\0\12\10"+ + "\1\0\5\10\1\0\3\10\1\0\5\10\1\0\5\10"); + + /** + * Translates DFA states to action switch labels. + */ + private static final int [] ZZ_ACTION = zzUnpackAction(); + + private static final String ZZ_ACTION_PACKED_0 = + "\2\0\1\1\1\2\2\3\1\4\1\5\1\6\1\1"+ + "\2\7\1\10\1\11\1\12\2\6\1\1\1\13\1\14"+ + "\1\15\1\16\1\17\1\20\1\21\1\22\1\23\1\24"+ + "\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34"+ + "\1\35\13\6\1\36\2\37\1\36\1\40\1\41\1\42"+ + "\1\43\2\0\1\44\1\45\1\46\1\0\1\47\1\50"+ + "\1\0\1\12\1\0\4\6\1\51\1\0\1\13\1\52"+ + "\1\53\1\54\1\55\1\56\1\57\1\60\1\61\1\62"+ + "\1\63\1\64\1\65\1\66\1\67\1\70\1\71\1\72"+ + "\5\6\1\73\3\6\1\74\10\6\1\41\1\44\1\0"+ + "\1\75\1\76\1\77\1\100\2\6\1\101\1\51\3\0"+ + "\1\102\1\0\1\103\1\104\1\105\20\6\1\106\1\41"+ + "\1\0\1\107\1\6\4\0\3\6\1\110\1\111\1\112"+ + "\1\113\1\114\13\6\1\0\1\115\1\6\1\116\1\6"+ + "\1\117\2\6\1\120\6\6\1\0\1\121\2\6\1\122"+ + "\2\6\1\123\1\124\1\125\3\6\1\126\1\127\1\6"+ + "\1\130\2\6\1\131\1\6\1\132"; + + private static int [] zzUnpackAction() { + int [] result = new int[209]; + int offset = 0; + offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackAction(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + do result[j++] = value; while (--count > 0); + } + return j; + } + + + /** + * Translates a state to a row index in the transition table + */ + private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); + + private static final String ZZ_ROWMAP_PACKED_0 = + "\0\0\0\101\0\202\0\303\0\202\0\303\0\u0104\0\u0145"+ + "\0\u0186\0\u01c7\0\u0208\0\u0249\0\u028a\0\u02cb\0\u030c\0\u034d"+ + "\0\u038e\0\u03cf\0\u0410\0\u0451\0\202\0\202\0\202\0\202"+ + "\0\202\0\202\0\u0492\0\202\0\202\0\u04d3\0\u0514\0\u0555"+ + "\0\u0596\0\u05d7\0\u0618\0\u0659\0\u069a\0\u06db\0\u071c\0\u075d"+ + "\0\u079e\0\u07df\0\u0820\0\u0861\0\u08a2\0\u08e3\0\u0924\0\u0965"+ + "\0\202\0\202\0\u09a6\0\u09e7\0\u0a28\0\u0a69\0\202\0\202"+ + "\0\u01c7\0\u0aaa\0\u0aeb\0\202\0\u0b2c\0\u0b6d\0\202\0\202"+ + "\0\u0bae\0\202\0\u0bef\0\u0c30\0\u0c71\0\u0cb2\0\u0cf3\0\u0d34"+ + "\0\u0d75\0\202\0\202\0\202\0\202\0\202\0\202\0\202"+ + "\0\202\0\202\0\202\0\u0db6\0\202\0\202\0\202\0\u0df7"+ + "\0\202\0\202\0\u0e38\0\u0e79\0\u0eba\0\u0efb\0\u0f3c\0\u0f7d"+ + "\0\u0fbe\0\u0fff\0\u1040\0\u1081\0\u0186\0\u10c2\0\u1103\0\u1144"+ + "\0\u1185\0\u11c6\0\u1207\0\u1248\0\u1289\0\u12ca\0\u130b\0\u134c"+ + "\0\202\0\u0b6d\0\202\0\u0186\0\u138d\0\u13ce\0\u0186\0\202"+ + "\0\u140f\0\u1450\0\u1491\0\u0d34\0\u14d2\0\202\0\202\0\202"+ + "\0\u1513\0\u1554\0\u1595\0\u15d6\0\u1617\0\u1658\0\u1699\0\u16da"+ + "\0\u171b\0\u175c\0\u179d\0\u17de\0\u181f\0\u1860\0\u18a1\0\u18e2"+ + "\0\u0186\0\202\0\u12ca\0\u0186\0\u1923\0\u1964\0\u19a5\0\u19e6"+ + "\0\u1a27\0\u1a68\0\u1aa9\0\u1aea\0\u0186\0\u0186\0\u0186\0\u0186"+ + "\0\u0186\0\u1b2b\0\u1b6c\0\u1bad\0\u1bee\0\u1c2f\0\u1c70\0\u1cb1"+ + "\0\u1cf2\0\u1d33\0\u1d74\0\u1db5\0\u1df6\0\u0186\0\u1e37\0\u0186"+ + "\0\u1e78\0\u0186\0\u1eb9\0\u1efa\0\u0186\0\u1f3b\0\u1f7c\0\u1fbd"+ + "\0\u1ffe\0\u203f\0\u2080\0\u20c1\0\u0186\0\u2102\0\u2143\0\u0186"+ + "\0\u2184\0\u21c5\0\u0186\0\u0186\0\u0186\0\u2206\0\u2247\0\u2288"+ + "\0\u0186\0\u0186\0\u22c9\0\u0186\0\u230a\0\u234b\0\u0186\0\u238c"+ + "\0\u0186"; + + private static int [] zzUnpackRowMap() { + int [] result = new int[209]; + int offset = 0; + offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackRowMap(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int high = packed.charAt(i++) << 16; + result[j++] = high | packed.charAt(i++); + } + return j; + } + + /** + * The transition table of the DFA + */ + private static final int [] ZZ_TRANS = zzUnpackTrans(); + + private static final String ZZ_TRANS_PACKED_0 = + "\1\3\3\4\1\5\1\6\1\7\1\10\1\11\1\12"+ + "\1\11\2\13\1\14\3\11\1\15\1\16\1\17\1\3"+ + "\1\11\1\13\1\20\1\21\1\22\1\11\1\23\1\24"+ + "\1\25\1\26\1\27\1\30\1\31\1\32\1\33\1\34"+ + "\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\44"+ + "\1\45\1\46\1\47\1\50\3\11\1\51\2\11\1\52"+ + "\1\11\1\53\1\54\1\55\1\56\1\57\1\60\2\11"+ + "\1\61\2\62\1\63\2\5\1\64\72\61\102\0\3\4"+ + "\1\0\1\4\101\0\1\65\1\66\36\0\1\67\100\0"+ + "\1\70\42\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\23\11\11\0\1\71\1\0\3\71\2\0\1\72\1\0"+ + "\1\73\3\0\1\71\31\0\1\72\11\0\1\74\17\0"+ + "\1\71\1\0\3\13\2\0\1\72\1\0\1\73\3\0"+ + "\1\13\31\0\1\72\11\0\1\74\17\0\1\71\1\0"+ + "\1\71\2\75\2\76\1\72\1\0\1\73\3\0\1\71"+ + "\31\0\1\72\11\0\1\74\27\0\1\77\24\0\1\100"+ + "\43\0\1\73\1\0\3\73\4\0\1\101\3\0\1\73"+ + "\52\0\2\17\2\0\17\17\1\102\1\103\54\17\10\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\3\11\1\104"+ + "\17\11\10\0\11\11\4\0\4\11\1\0\1\105\23\0"+ + "\3\11\1\106\4\11\1\107\12\11\24\110\1\111\54\110"+ + "\33\23\1\112\45\23\34\0\1\113\11\0\1\114\100\0"+ + "\1\115\100\0\1\116\100\0\1\117\100\0\1\120\1\0"+ + "\1\121\76\0\1\122\2\0\1\123\1\124\74\0\1\125"+ + "\53\0\1\126\24\0\1\127\4\0\1\130\73\0\1\131"+ + "\100\0\1\132\6\0\1\133\33\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\1\11\1\134\21\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\2\11\1\135\1\136"+ + "\17\11\10\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\5\11\1\137\15\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\22\11\1\140\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\10\11\1\141\12\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\3\11\1\142\3\11"+ + "\1\143\1\144\12\11\10\0\11\11\4\0\3\11\1\145"+ + "\1\0\1\11\23\0\12\11\1\146\5\11\1\147\2\11"+ + "\10\0\11\11\4\0\4\11\1\0\1\11\23\0\2\11"+ + "\1\150\20\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\3\11\1\151\17\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\2\11\1\152\3\11\1\153\12\11"+ + "\1\154\1\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\3\11\1\155\17\11\2\0\1\62\104\0\1\65"+ + "\1\66\71\0\2\65\2\0\75\65\7\66\1\156\71\66"+ + "\11\0\1\157\1\0\3\157\3\0\1\160\4\0\1\157"+ + "\21\0\1\160\41\0\1\73\1\0\3\73\2\0\1\72"+ + "\5\0\1\73\31\0\1\72\11\0\1\161\17\0\1\71"+ + "\1\0\1\71\2\75\2\0\1\72\1\0\1\73\3\0"+ + "\1\71\31\0\1\72\11\0\1\74\20\0\4\162\2\0"+ + "\1\162\5\0\1\162\1\0\1\162\25\0\1\162\1\0"+ + "\2\162\7\0\1\162\1\0\1\162\27\0\1\163\72\0"+ + "\3\17\4\0\6\17\1\0\1\17\23\0\2\17\1\0"+ + "\1\17\2\0\1\17\3\0\1\17\20\0\11\11\4\0"+ + "\4\11\1\0\1\11\23\0\1\11\1\164\21\11\10\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\12\11\1\165"+ + "\10\11\10\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\5\11\1\166\15\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\1\11\1\167\21\11\31\0\1\170\63\0"+ + "\2\171\1\172\5\0\1\110\1\173\1\0\2\110\1\174"+ + "\1\175\23\0\2\110\1\0\1\110\2\0\1\110\3\0"+ + "\1\110\56\0\1\176\100\0\1\177\100\0\1\200\42\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\2\11\1\201"+ + "\20\11\10\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\6\11\1\202\14\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\12\11\1\203\10\11\10\0\11\11\4\0"+ + "\4\11\1\0\1\11\23\0\17\11\1\204\3\11\10\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\16\11\1\205"+ + "\4\11\10\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\6\11\1\206\14\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\17\11\1\207\3\11\10\0\11\11\4\0"+ + "\4\11\1\0\1\11\23\0\3\11\1\210\17\11\10\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\12\11\1\211"+ + "\10\11\10\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\6\11\1\212\14\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\16\11\1\213\4\11\10\0\11\11\4\0"+ + "\3\11\1\214\1\0\1\11\23\0\23\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\13\11\1\215\7\11"+ + "\10\0\11\11\4\0\4\11\1\0\1\11\23\0\5\11"+ + "\1\216\15\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\1\11\1\217\21\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\14\11\1\220\6\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\16\11\1\221\4\11"+ + "\6\66\1\222\1\223\71\66\11\0\1\157\1\0\3\157"+ + "\10\0\1\157\43\0\1\161\17\0\1\157\1\0\3\157"+ + "\10\0\1\157\62\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\13\11\1\224\7\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\5\11\1\225\15\11\14\0\2\226"+ + "\75\0\4\227\2\0\1\227\5\0\1\227\1\0\1\227"+ + "\25\0\1\227\1\0\2\227\7\0\1\227\1\0\1\227"+ + "\17\0\4\230\2\0\1\230\5\0\1\230\1\0\1\230"+ + "\25\0\1\230\1\0\2\230\7\0\1\230\1\0\1\230"+ + "\17\0\4\231\2\0\1\231\5\0\1\231\1\0\1\231"+ + "\25\0\1\231\1\0\2\231\7\0\1\231\1\0\1\231"+ + "\15\0\11\11\4\0\4\11\1\0\1\11\23\0\3\11"+ + "\1\232\17\11\10\0\11\11\4\0\4\11\1\0\1\233"+ + "\23\0\23\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\11\11\1\234\11\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\2\11\1\235\20\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\2\11\1\236\20\11"+ + "\10\0\11\11\4\0\4\11\1\0\1\11\23\0\10\11"+ + "\1\237\12\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\2\11\1\240\20\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\12\11\1\241\10\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\6\11\1\242\10\11"+ + "\1\243\3\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\2\11\1\244\20\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\10\11\1\245\12\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\2\11\1\246\1\247"+ + "\17\11\10\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\4\11\1\250\16\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\2\11\1\251\20\11\10\0\11\11\4\0"+ + "\4\11\1\0\1\252\23\0\23\11\10\0\11\11\4\0"+ + "\4\11\1\0\1\11\23\0\6\11\1\253\14\11\10\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\6\11\1\254"+ + "\14\11\14\0\2\110\75\0\4\110\2\0\1\110\5\0"+ + "\1\110\1\0\1\110\25\0\1\110\1\0\2\110\7\0"+ + "\1\110\1\0\1\110\17\0\4\255\2\0\1\255\5\0"+ + "\1\255\1\0\1\255\25\0\1\255\1\0\2\255\7\0"+ + "\1\255\1\0\1\255\17\0\4\172\2\0\1\172\5\0"+ + "\1\172\1\0\1\172\25\0\1\172\1\0\2\172\7\0"+ + "\1\172\1\0\1\172\15\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\4\11\1\256\16\11\10\0\11\11\4\0"+ + "\4\11\1\0\1\11\23\0\1\11\1\257\21\11\10\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\2\11\1\260"+ + "\20\11\10\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\14\11\1\261\6\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\6\11\1\262\14\11\10\0\11\11\4\0"+ + "\4\11\1\0\1\11\23\0\1\11\1\263\21\11\10\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\1\11\1\264"+ + "\21\11\10\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\1\11\1\265\21\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\266\23\0\23\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\3\11\1\267\17\11\10\0\11\11\4\0"+ + "\4\11\1\0\1\11\23\0\13\11\1\270\7\11\10\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\13\11\1\271"+ + "\7\11\10\0\11\11\4\0\4\11\1\0\1\11\23\0"+ + "\13\11\1\272\7\11\10\0\11\11\4\0\4\11\1\0"+ + "\1\11\23\0\7\11\1\273\13\11\12\0\4\274\2\0"+ + "\1\274\5\0\1\274\1\0\1\274\25\0\1\274\1\0"+ + "\2\274\7\0\1\274\1\0\1\274\15\0\11\11\4\0"+ + "\4\11\1\0\1\11\23\0\12\11\1\275\10\11\10\0"+ + "\11\11\4\0\4\11\1\0\1\11\23\0\12\11\1\276"+ + "\10\11\10\0\11\11\4\0\3\11\1\277\1\0\1\11"+ + "\23\0\23\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\6\11\1\300\14\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\5\11\1\301\15\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\11\11\1\302\11\11"+ + "\10\0\11\11\4\0\4\11\1\0\1\11\23\0\6\11"+ + "\1\303\14\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\6\11\1\304\14\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\7\11\1\305\13\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\1\11\1\306\21\11"+ + "\12\0\4\175\2\0\1\175\5\0\1\175\1\0\1\175"+ + "\25\0\1\175\1\0\2\175\7\0\1\175\1\0\1\175"+ + "\15\0\11\11\4\0\4\11\1\0\1\307\23\0\23\11"+ + "\10\0\11\11\4\0\4\11\1\0\1\11\23\0\3\11"+ + "\1\310\17\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\6\11\1\311\14\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\2\11\1\312\20\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\10\11\1\313\12\11"+ + "\10\0\11\11\4\0\4\11\1\0\1\11\23\0\2\11"+ + "\1\314\20\11\10\0\11\11\4\0\4\11\1\0\1\11"+ + "\23\0\13\11\1\315\7\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\316\23\0\23\11\10\0\11\11\4\0\4\11"+ + "\1\0\1\11\23\0\2\11\1\317\20\11\10\0\11\11"+ + "\4\0\4\11\1\0\1\11\23\0\11\11\1\320\11\11"+ + "\10\0\11\11\4\0\4\11\1\0\1\11\23\0\7\11"+ + "\1\321\13\11"; + + private static int [] zzUnpackTrans() { + int [] result = new int[9165]; + int offset = 0; + offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackTrans(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + value--; + do result[j++] = value; while (--count > 0); + } + return j; + } + + + /* error codes */ + private static final int ZZ_UNKNOWN_ERROR = 0; + private static final int ZZ_NO_MATCH = 1; + private static final int ZZ_PUSHBACK_2BIG = 2; + + /* error messages for the codes above */ + private static final String[] ZZ_ERROR_MSG = { + "Unknown internal scanner error", + "Error: could not match input", + "Error: pushback value was too large" + }; + + /** + * ZZ_ATTRIBUTE[aState] contains the attributes of state aState + */ + private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); + + private static final String ZZ_ATTRIBUTE_PACKED_0 = + "\2\0\1\11\1\1\1\11\17\1\6\11\1\1\2\11"+ + "\23\1\2\11\4\1\2\11\2\0\1\1\1\11\1\1"+ + "\1\0\2\11\1\0\1\11\1\0\5\1\1\0\12\11"+ + "\1\1\3\11\1\1\2\11\25\1\1\0\1\11\1\1"+ + "\1\11\4\1\1\11\3\0\1\1\1\0\3\11\21\1"+ + "\1\11\1\0\2\1\4\0\23\1\1\0\16\1\1\0"+ + "\25\1"; + + private static int [] zzUnpackAttribute() { + int [] result = new int[209]; + int offset = 0; + offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackAttribute(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + do result[j++] = value; while (--count > 0); + } + return j; + } + + /** the input device */ + private java.io.Reader zzReader; + + /** the current state of the DFA */ + private int zzState; + + /** the current lexical state */ + private int zzLexicalState = YYINITIAL; + + /** this buffer contains the current text to be matched and is + the source of the yytext() string */ + private CharSequence zzBuffer = ""; + + /** the textposition at the last accepting state */ + private int zzMarkedPos; + + /** the current text position in the buffer */ + private int zzCurrentPos; + + /** startRead marks the beginning of the yytext() string in the buffer */ + private int zzStartRead; + + /** endRead marks the last character in the buffer, that has been read + from input */ + private int zzEndRead; + + /** + * zzAtBOL == true <=> the scanner is currently at the beginning of a line + */ + private boolean zzAtBOL = true; + + /** zzAtEOF == true <=> the scanner is at the EOF */ + private boolean zzAtEOF; + + /** denotes if the user-EOF-code has already been executed */ + private boolean zzEOFDone; + + /* user code: */ + public _GoLexer() { + this((java.io.Reader)null); + } + + + /** + * Creates a new scanner + * + * @param in the java.io.Reader to read input from. + */ + public _GoLexer(java.io.Reader in) { + this.zzReader = in; + } + + + /** + * Unpacks the compressed character translation table. + * + * @param packed the packed character translation table + * @return the unpacked character translation table + */ + private static char [] zzUnpackCMap(String packed) { + int size = 0; + for (int i = 0, length = packed.length(); i < length; i += 2) { + size += packed.charAt(i); + } + char[] map = new char[size]; + int i = 0; /* index in packed string */ + int j = 0; /* index in unpacked array */ + while (i < packed.length()) { + int count = packed.charAt(i++); + char value = packed.charAt(i++); + do map[j++] = value; while (--count > 0); + } + return map; + } + + public final int getTokenStart() { + return zzStartRead; + } + + public final int getTokenEnd() { + return getTokenStart() + yylength(); + } + + public void reset(CharSequence buffer, int start, int end, int initialState) { + zzBuffer = buffer; + zzCurrentPos = zzMarkedPos = zzStartRead = start; + zzAtEOF = false; + zzAtBOL = true; + zzEndRead = end; + yybegin(initialState); + } + + /** + * Refills the input buffer. + * + * @return false, iff there was new input. + * + * @exception java.io.IOException if any I/O-Error occurs + */ + private boolean zzRefill() throws java.io.IOException { + return true; + } + + + /** + * Returns the current lexical state. + */ + public final int yystate() { + return zzLexicalState; + } + + + /** + * Enters a new lexical state + * + * @param newState the new lexical state + */ + public final void yybegin(int newState) { + zzLexicalState = newState; + } + + + /** + * Returns the text matched by the current regular expression. + */ + public final CharSequence yytext() { + return zzBuffer.subSequence(zzStartRead, zzMarkedPos); + } + + + /** + * Returns the character at position pos from the + * matched text. + * + * It is equivalent to yytext().charAt(pos), but faster + * + * @param pos the position of the character to fetch. + * A value from 0 to yylength()-1. + * + * @return the character at position pos + */ + public final char yycharat(int pos) { + return zzBuffer.charAt(zzStartRead+pos); + } + + + /** + * Returns the length of the matched text region. + */ + public final int yylength() { + return zzMarkedPos-zzStartRead; + } + + + /** + * Reports an error that occurred while scanning. + * + * In a wellformed scanner (no or only correct usage of + * yypushback(int) and a match-all fallback rule) this method + * will only be called with things that "Can't Possibly Happen". + * If this method is called, something is seriously wrong + * (e.g. a JFlex bug producing a faulty scanner etc.). + * + * Usual syntax/scanner level error handling should be done + * in error fallback rules. + * + * @param errorCode the code of the errormessage to display + */ + private void zzScanError(int errorCode) { + String message; + try { + message = ZZ_ERROR_MSG[errorCode]; + } + catch (ArrayIndexOutOfBoundsException e) { + message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; + } + + throw new Error(message); + } + + + /** + * Pushes the specified amount of characters back into the input stream. + * + * They will be read again by then next call of the scanning method + * + * @param number the number of characters to be read again. + * This number must not be greater than yylength()! + */ + public void yypushback(int number) { + if ( number > yylength() ) + zzScanError(ZZ_PUSHBACK_2BIG); + + zzMarkedPos -= number; + } + + + /** + * Resumes scanning until the next regular expression is matched, + * the end of input is encountered or an I/O-Error occurs. + * + * @return the next token + * @exception java.io.IOException if any I/O-Error occurs + */ + public IElementType advance() throws java.io.IOException { + int zzInput; + int zzAction; + + // cached fields: + int zzCurrentPosL; + int zzMarkedPosL; + int zzEndReadL = zzEndRead; + CharSequence zzBufferL = zzBuffer; + + int [] zzTransL = ZZ_TRANS; + int [] zzRowMapL = ZZ_ROWMAP; + int [] zzAttrL = ZZ_ATTRIBUTE; + + while (true) { + zzMarkedPosL = zzMarkedPos; + + zzAction = -1; + + zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; + + zzState = ZZ_LEXSTATE[zzLexicalState]; + + // set up zzAction for empty match case: + int zzAttributes = zzAttrL[zzState]; + if ( (zzAttributes & 1) == 1 ) { + zzAction = zzState; + } + + + zzForAction: { + while (true) { + + if (zzCurrentPosL < zzEndReadL) { + zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL/*, zzEndReadL*/); + zzCurrentPosL += Character.charCount(zzInput); + } + else if (zzAtEOF) { + zzInput = YYEOF; + break zzForAction; + } + else { + // store back cached positions + zzCurrentPos = zzCurrentPosL; + zzMarkedPos = zzMarkedPosL; + boolean eof = zzRefill(); + // get translated positions and possibly new buffer + zzCurrentPosL = zzCurrentPos; + zzMarkedPosL = zzMarkedPos; + zzBufferL = zzBuffer; + zzEndReadL = zzEndRead; + if (eof) { + zzInput = YYEOF; + break zzForAction; + } + else { + zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL/*, zzEndReadL*/); + zzCurrentPosL += Character.charCount(zzInput); + } + } + int zzNext = zzTransL[ zzRowMapL[zzState] + ZZ_CMAP(zzInput) ]; + if (zzNext == -1) break zzForAction; + zzState = zzNext; + + zzAttributes = zzAttrL[zzState]; + if ( (zzAttributes & 1) == 1 ) { + zzAction = zzState; + zzMarkedPosL = zzCurrentPosL; + if ( (zzAttributes & 8) == 8 ) break zzForAction; + } + + } + } + + // store back cached position + zzMarkedPos = zzMarkedPosL; + + if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { + zzAtEOF = true; + return null; + } + else { + switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { + case 1: + { return BAD_CHARACTER; + } + // fall through + case 91: break; + case 2: + { return NLS; + } + // fall through + case 92: break; + case 3: + { return WS; + } + // fall through + case 93: break; + case 4: + { return QUOTIENT; + } + // fall through + case 94: break; + case 5: + { return MUL; + } + // fall through + case 95: break; + case 6: + { yybegin(MAYBE_SEMICOLON); return IDENTIFIER; + } + // fall through + case 96: break; + case 7: + { yybegin(MAYBE_SEMICOLON); return INT; + } + // fall through + case 97: break; + case 8: + { return MINUS; + } + // fall through + case 98: break; + case 9: + { return DOT; + } + // fall through + case 99: break; + case 10: + { yybegin(MAYBE_SEMICOLON); return STRING; + } + // fall through + case 100: break; + case 11: + { yybegin(MAYBE_SEMICOLON); return RAW_STRING; + } + // fall through + case 101: break; + case 12: + { return BIT_OR; + } + // fall through + case 102: break; + case 13: + { return LBRACE; + } + // fall through + case 103: break; + case 14: + { yybegin(MAYBE_SEMICOLON); return RBRACE; + } + // fall through + case 104: break; + case 15: + { return LBRACK; + } + // fall through + case 105: break; + case 16: + { yybegin(MAYBE_SEMICOLON); return RBRACK; + } + // fall through + case 106: break; + case 17: + { return LPAREN; + } + // fall through + case 107: break; + case 18: + { yybegin(MAYBE_SEMICOLON); return RPAREN; + } + // fall through + case 108: break; + case 19: + { return COLON; + } + // fall through + case 109: break; + case 20: + { return SEMICOLON; + } + // fall through + case 110: break; + case 21: + { return COMMA; + } + // fall through + case 111: break; + case 22: + { return ASSIGN; + } + // fall through + case 112: break; + case 23: + { return NOT; + } + // fall through + case 113: break; + case 24: + { return PLUS; + } + // fall through + case 114: break; + case 25: + { return BIT_AND; + } + // fall through + case 115: break; + case 26: + { return BIT_XOR; + } + // fall through + case 116: break; + case 27: + { return LESS; + } + // fall through + case 117: break; + case 28: + { return REMAINDER; + } + // fall through + case 118: break; + case 29: + { return GREATER; + } + // fall through + case 119: break; + case 30: + { yybegin(YYINITIAL); yypushback(yytext().length()); + } + // fall through + case 120: break; + case 31: + { yybegin(YYINITIAL); yypushback(yytext().length()); return SEMICOLON_SYNTHETIC; + } + // fall through + case 121: break; + case 32: + { return LINE_COMMENT; + } + // fall through + case 122: break; + case 33: + { return MULTILINE_COMMENT; + } + // fall through + case 123: break; + case 34: + { return QUOTIENT_ASSIGN; + } + // fall through + case 124: break; + case 35: + { return MUL_ASSIGN; + } + // fall through + case 125: break; + case 36: + { yybegin(MAYBE_SEMICOLON); return FLOAT; + } + // fall through + case 126: break; + case 37: + { yybegin(MAYBE_SEMICOLON); return DECIMALI; + } + // fall through + case 127: break; + case 38: + { yybegin(MAYBE_SEMICOLON); return OCT; + } + // fall through + case 128: break; + case 39: + { yybegin(MAYBE_SEMICOLON); return MINUS_MINUS; + } + // fall through + case 129: break; + case 40: + { return MINUS_ASSIGN; + } + // fall through + case 130: break; + case 41: + { yybegin(MAYBE_SEMICOLON); return CHAR; + } + // fall through + case 131: break; + case 42: + { return COND_OR; + } + // fall through + case 132: break; + case 43: + { return BIT_OR_ASSIGN; + } + // fall through + case 133: break; + case 44: + { return VAR_ASSIGN; + } + // fall through + case 134: break; + case 45: + { return EQ; + } + // fall through + case 135: break; + case 46: + { return NOT_EQ; + } + // fall through + case 136: break; + case 47: + { return PLUS_ASSIGN; + } + // fall through + case 137: break; + case 48: + { yybegin(MAYBE_SEMICOLON); return PLUS_PLUS; + } + // fall through + case 138: break; + case 49: + { return BIT_AND_ASSIGN; + } + // fall through + case 139: break; + case 50: + { return COND_AND; + } + // fall through + case 140: break; + case 51: + { return BIT_CLEAR; + } + // fall through + case 141: break; + case 52: + { return BIT_XOR_ASSIGN; + } + // fall through + case 142: break; + case 53: + { return SEND_CHANNEL; + } + // fall through + case 143: break; + case 54: + { return LESS_OR_EQUAL; + } + // fall through + case 144: break; + case 55: + { return SHIFT_LEFT; + } + // fall through + case 145: break; + case 56: + { return REMAINDER_ASSIGN; + } + // fall through + case 146: break; + case 57: + { return GREATER_OR_EQUAL; + } + // fall through + case 147: break; + case 58: + { return SHIFT_RIGHT; + } + // fall through + case 148: break; + case 59: + { return GO; + } + // fall through + case 149: break; + case 60: + { return IF ; + } + // fall through + case 150: break; + case 61: + { yybegin(MAYBE_SEMICOLON); return FLOATI; + } + // fall through + case 151: break; + case 62: + { yybegin(MAYBE_SEMICOLON); return HEX; + } + // fall through + case 152: break; + case 63: + { return TRIPLE_DOT; + } + // fall through + case 153: break; + case 64: + { return VAR; + } + // fall through + case 154: break; + case 65: + { return FOR ; + } + // fall through + case 155: break; + case 66: + { yybegin(MAYBE_SEMICOLON); return BAD_CHARACTER; + } + // fall through + case 156: break; + case 67: + { return BIT_CLEAR_ASSIGN; + } + // fall through + case 157: break; + case 68: + { return SHIFT_LEFT_ASSIGN; + } + // fall through + case 158: break; + case 69: + { return SHIFT_RIGHT_ASSIGN; + } + // fall through + case 159: break; + case 70: + { return MAP; + } + // fall through + case 160: break; + case 71: + { return FUNC; + } + // fall through + case 161: break; + case 72: + { return ELSE; + } + // fall through + case 162: break; + case 73: + { return TYPE_; + } + // fall through + case 163: break; + case 74: + { return GOTO; + } + // fall through + case 164: break; + case 75: + { return CASE; + } + // fall through + case 165: break; + case 76: + { return CHAN; + } + // fall through + case 166: break; + case 77: + { yybegin(MAYBE_SEMICOLON); return BREAK; + } + // fall through + case 167: break; + case 78: + { return RANGE; + } + // fall through + case 168: break; + case 79: + { return CONST; + } + // fall through + case 169: break; + case 80: + { return DEFER; + } + // fall through + case 170: break; + case 81: + { yybegin(MAYBE_SEMICOLON); return RETURN ; + } + // fall through + case 171: break; + case 82: + { return IMPORT ; + } + // fall through + case 172: break; + case 83: + { return SELECT; + } + // fall through + case 173: break; + case 84: + { return STRUCT; + } + // fall through + case 174: break; + case 85: + { return SWITCH; + } + // fall through + case 175: break; + case 86: + { return DEFAULT; + } + // fall through + case 176: break; + case 87: + { return PACKAGE; + } + // fall through + case 177: break; + case 88: + { yybegin(MAYBE_SEMICOLON); return CONTINUE ; + } + // fall through + case 178: break; + case 89: + { return INTERFACE; + } + // fall through + case 179: break; + case 90: + { yybegin(MAYBE_SEMICOLON); return FALLTHROUGH; + } + // fall through + case 180: break; + default: + zzScanError(ZZ_NO_MATCH); + } + } + } + } + + +} diff --git a/src/main/gen/com/notzippy/intellij/go/parser/GoParser.java b/src/main/gen/com/notzippy/intellij/go/parser/GoParser.java index 00596cb9e7..f33b776031 100644 --- a/src/main/gen/com/notzippy/intellij/go/parser/GoParser.java +++ b/src/main/gen/com/notzippy/intellij/go/parser/GoParser.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,13 +16,14 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide.parser; +package com.notzippy.intellij.go.parser; import com.intellij.lang.PsiBuilder; import com.intellij.lang.PsiBuilder.Marker; -import static com.goide.GoTypes.*; -import static com.goide.parser.GoParserUtil.*; +import static com.notzippy.intellij.go.parser.GoTypes.*; +import static com.notzippy.intellij.go.parser.GoParserUtil.*; import com.intellij.psi.tree.IElementType; +import com.intellij.psi.tree.IFileElementType; import com.intellij.lang.ASTNode; import com.intellij.psi.tree.TokenSet; import com.intellij.lang.PsiParser; @@ -39,263 +41,11 @@ public void parseLight(IElementType t, PsiBuilder b) { boolean r; b = adapt_builder_(t, b, this, EXTENDS_SETS_); Marker m = enter_section_(b, 0, _COLLAPSE_, null); - if (t == ANONYMOUS_FIELD_DEFINITION) { - r = AnonymousFieldDefinition(b, 0); - } - else if (t == ARGUMENT_LIST) { - r = ArgumentList(b, 0); - } - else if (t == ARRAY_OR_SLICE_TYPE) { - r = ArrayOrSliceType(b, 0); - } - else if (t == ASSIGNMENT_STATEMENT) { - r = AssignmentStatement(b, 0); - } - else if (t == BLOCK) { - r = Block(b, 0); - } - else if (t == BREAK_STATEMENT) { - r = BreakStatement(b, 0); - } - else if (t == BUILTIN_ARGUMENT_LIST) { - r = BuiltinArgumentList(b, 0); - } - else if (t == CHANNEL_TYPE) { - r = ChannelType(b, 0); - } - else if (t == COMM_CASE) { - r = CommCase(b, 0); - } - else if (t == COMM_CLAUSE) { - r = CommClause(b, 0); - } - else if (t == CONST_DECLARATION) { - r = ConstDeclaration(b, 0); - } - else if (t == CONST_DEFINITION) { - r = ConstDefinition(b, 0); - } - else if (t == CONST_SPEC) { - r = ConstSpec(b, 0); - } - else if (t == CONTINUE_STATEMENT) { - r = ContinueStatement(b, 0); - } - else if (t == DEFER_STATEMENT) { - r = DeferStatement(b, 0); - } - else if (t == ELEMENT) { - r = Element(b, 0); - } - else if (t == ELSE_STATEMENT) { - r = ElseStatement(b, 0); - } - else if (t == EXPR_CASE_CLAUSE) { - r = ExprCaseClause(b, 0); - } - else if (t == EXPR_SWITCH_STATEMENT) { - r = ExprSwitchStatement(b, 0); - } - else if (t == EXPRESSION) { - r = Expression(b, 0, -1); - } - else if (t == FALLTHROUGH_STATEMENT) { - r = FallthroughStatement(b, 0); - } - else if (t == FIELD_DECLARATION) { - r = FieldDeclaration(b, 0); - } - else if (t == FIELD_DEFINITION) { - r = FieldDefinition(b, 0); - } - else if (t == FIELD_NAME) { - r = FieldName(b, 0); - } - else if (t == FOR_CLAUSE) { - r = ForClause(b, 0); - } - else if (t == FOR_STATEMENT) { - r = ForStatement(b, 0); - } - else if (t == FUNCTION_DECLARATION) { - r = FunctionDeclaration(b, 0); - } - else if (t == FUNCTION_TYPE) { - r = FunctionType(b, 0); - } - else if (t == GO_STATEMENT) { - r = GoStatement(b, 0); - } - else if (t == GOTO_STATEMENT) { - r = GotoStatement(b, 0); - } - else if (t == IF_STATEMENT) { - r = IfStatement(b, 0); - } - else if (t == IMPORT_DECLARATION) { - r = ImportDeclaration(b, 0); - } - else if (t == IMPORT_LIST) { - r = ImportList(b, 0); - } - else if (t == IMPORT_SPEC) { - r = ImportSpec(b, 0); - } - else if (t == IMPORT_STRING) { - r = ImportString(b, 0); - } - else if (t == INC_DEC_STATEMENT) { - r = IncDecStatement(b, 0); - } - else if (t == INTERFACE_TYPE) { - r = InterfaceType(b, 0); - } - else if (t == KEY) { - r = Key(b, 0); - } - else if (t == LABEL_DEFINITION) { - r = LabelDefinition(b, 0); - } - else if (t == LABEL_REF) { - r = LabelRef(b, 0); - } - else if (t == LABELED_STATEMENT) { - r = LabeledStatement(b, 0); - } - else if (t == LEFT_HAND_EXPR_LIST) { - r = LeftHandExprList(b, 0); - } - else if (t == LITERAL_TYPE_EXPR) { - r = LiteralTypeExpr(b, 0); - } - else if (t == LITERAL_VALUE) { - r = LiteralValue(b, 0); - } - else if (t == MAP_TYPE) { - r = MapType(b, 0); - } - else if (t == METHOD_DECLARATION) { - r = MethodDeclaration(b, 0); - } - else if (t == METHOD_SPEC) { - r = MethodSpec(b, 0); - } - else if (t == PACKAGE_CLAUSE) { - r = PackageClause(b, 0); - } - else if (t == PAR_TYPE) { - r = ParType(b, 0); - } - else if (t == PARAM_DEFINITION) { - r = ParamDefinition(b, 0); - } - else if (t == PARAMETER_DECLARATION) { - r = ParameterDeclaration(b, 0); - } - else if (t == PARAMETERS) { - r = Parameters(b, 0); - } - else if (t == POINTER_TYPE) { - r = PointerType(b, 0); - } - else if (t == RANGE_CLAUSE) { - r = RangeClause(b, 0); - } - else if (t == RECEIVER) { - r = Receiver(b, 0); - } - else if (t == RECV_STATEMENT) { - r = RecvStatement(b, 0); - } - else if (t == REFERENCE_EXPRESSION) { - r = ReferenceExpression(b, 0); - } - else if (t == RESULT) { - r = Result(b, 0); - } - else if (t == RETURN_STATEMENT) { - r = ReturnStatement(b, 0); - } - else if (t == SELECT_STATEMENT) { - r = SelectStatement(b, 0); - } - else if (t == SEND_STATEMENT) { - r = SendStatement(b, 0); - } - else if (t == SHORT_VAR_DECLARATION) { - r = ShortVarDeclaration(b, 0); - } - else if (t == SIGNATURE) { - r = Signature(b, 0); - } - else if (t == SIMPLE_STATEMENT) { - r = SimpleStatement(b, 0); - } - else if (t == SPEC_TYPE) { - r = SpecType(b, 0); - } - else if (t == STATEMENT) { - r = Statement(b, 0); - } - else if (t == STRING_LITERAL) { - r = StringLiteral(b, 0); - } - else if (t == STRUCT_TYPE) { - r = StructType(b, 0); - } - else if (t == SWITCH_START) { - r = SwitchStart(b, 0); - } - else if (t == SWITCH_STATEMENT) { - r = SwitchStatement(b, 0); - } - else if (t == TAG) { - r = Tag(b, 0); - } - else if (t == TYPE) { - r = Type(b, 0); - } - else if (t == TYPE_CASE_CLAUSE) { - r = TypeCaseClause(b, 0); - } - else if (t == TYPE_DECLARATION) { - r = TypeDeclaration(b, 0); - } - else if (t == TYPE_GUARD) { - r = TypeGuard(b, 0); - } - else if (t == TYPE_LIST) { - r = TypeList(b, 0); - } - else if (t == TYPE_REFERENCE_EXPRESSION) { - r = TypeReferenceExpression(b, 0); - } - else if (t == TYPE_SPEC) { - r = TypeSpec(b, 0); - } - else if (t == TYPE_SWITCH_GUARD) { - r = TypeSwitchGuard(b, 0); - } - else if (t == TYPE_SWITCH_STATEMENT) { - r = TypeSwitchStatement(b, 0); - } - else if (t == VALUE) { - r = Value(b, 0); - } - else if (t == VAR_DECLARATION) { - r = VarDeclaration(b, 0); - } - else if (t == VAR_DEFINITION) { - r = VarDefinition(b, 0); - } - else if (t == VAR_SPEC) { - r = VarSpec(b, 0); - } - else if (t == ASSIGN_OP) { - r = assign_op(b, 0); + if (t instanceof IFileElementType) { + r = parse_root_(t, b, 0); } else { - r = parse_root_(t, b, 0); + r = false; } exit_section_(b, 0, m, t, r, true, TRUE_CONDITION); } @@ -666,11 +416,11 @@ private static boolean BuiltinArgumentList_1_0_1(PsiBuilder b, int l) { // chan '<-'? | '<-' chan static boolean ChanTypePrefix(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ChanTypePrefix")) return false; - if (!nextTokenIs(b, "", SEND_CHANNEL, CHAN)) return false; + if (!nextTokenIs(b, "", CHAN, SEND_CHANNEL)) return false; boolean r; Marker m = enter_section_(b); r = ChanTypePrefix_0(b, l + 1); - if (!r) r = ChanTypePrefix_1(b, l + 1); + if (!r) r = parseTokens(b, 1, SEND_CHANNEL, CHAN); exit_section_(b, m, null, r); return r; } @@ -694,23 +444,11 @@ private static boolean ChanTypePrefix_0_1(PsiBuilder b, int l) { return true; } - // '<-' chan - private static boolean ChanTypePrefix_1(PsiBuilder b, int l) { - if (!recursion_guard_(b, l, "ChanTypePrefix_1")) return false; - boolean r, p; - Marker m = enter_section_(b, l, _NONE_); - r = consumeToken(b, SEND_CHANNEL); - p = r; // pin = 1 - r = r && consumeToken(b, CHAN); - exit_section_(b, l, m, r, p, null); - return r || p; - } - /* ********************************************************** */ // ChanTypePrefix Type public static boolean ChannelType(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ChannelType")) return false; - if (!nextTokenIs(b, "", SEND_CHANNEL, CHAN)) return false; + if (!nextTokenIs(b, "", CHAN, SEND_CHANNEL)) return false; boolean r, p; Marker m = enter_section_(b, l, _COLLAPSE_, CHANNEL_TYPE, ""); r = ChanTypePrefix(b, l + 1); @@ -884,11 +622,10 @@ static boolean ConstDefinitionList(PsiBuilder b, int l) { // ( ',' ConstDefinition )* private static boolean ConstDefinitionList_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ConstDefinitionList_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!ConstDefinitionList_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ConstDefinitionList_1", c)) break; - c = current_position_(b); } return true; } @@ -980,11 +717,10 @@ static boolean ConstSpecs(PsiBuilder b, int l) { // (semi ConstSpec)* private static boolean ConstSpecs_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ConstSpecs_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!ConstSpecs_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ConstSpecs_1", c)) break; - c = current_position_(b); } return true; } @@ -1214,11 +950,10 @@ static boolean ElementList(PsiBuilder b, int l) { // ( ',' E? )* private static boolean ElementList_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ElementList_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!ElementList_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ElementList_1", c)) break; - c = current_position_(b); } return true; } @@ -1260,10 +995,8 @@ public static boolean ElseStatement(PsiBuilder b, int l) { private static boolean ElseStatement_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ElseStatement_1")) return false; boolean r; - Marker m = enter_section_(b); r = IfStatement(b, l + 1); if (!r) r = Block(b, l + 1); - exit_section_(b, m, null, r); return r; } @@ -1342,11 +1075,10 @@ public static boolean ExprSwitchStatement(PsiBuilder b, int l) { // ExprCaseClause* private static boolean ExprSwitchStatement_2(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ExprSwitchStatement_2")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!ExprCaseClause(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ExprSwitchStatement_2", c)) break; - c = current_position_(b); } return true; } @@ -1367,11 +1099,10 @@ static boolean ExpressionArgList(PsiBuilder b, int l) { // (',' (ExpressionOrTypeWithRecover2 | &')'))* private static boolean ExpressionArgList_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ExpressionArgList_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!ExpressionArgList_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ExpressionArgList_1", c)) break; - c = current_position_(b); } return true; } @@ -1425,11 +1156,10 @@ static boolean ExpressionList(PsiBuilder b, int l) { // (',' (ExpressionWithRecover | &')'))* private static boolean ExpressionList_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ExpressionList_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!ExpressionList_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ExpressionList_1", c)) break; - c = current_position_(b); } return true; } @@ -1570,10 +1300,8 @@ private static boolean ExpressionListRecover_0(PsiBuilder b, int l) { static boolean ExpressionOrLiteralTypeExpr(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ExpressionOrLiteralTypeExpr")) return false; boolean r; - Marker m = enter_section_(b); r = Expression(b, l + 1, -1); if (!r) r = LiteralTypeExpr(b, l + 1); - exit_section_(b, m, null, r); return r; } @@ -1753,11 +1481,10 @@ static boolean FieldDefinitionList(PsiBuilder b, int l) { // (',' FieldDefinition)* private static boolean FieldDefinitionList_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "FieldDefinitionList_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!FieldDefinitionList_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "FieldDefinitionList_1", c)) break; - c = current_position_(b); } return true; } @@ -1803,11 +1530,10 @@ static boolean Fields(PsiBuilder b, int l) { // (semi FieldDeclaration)* private static boolean Fields_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "Fields_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!Fields_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "Fields_1", c)) break; - c = current_position_(b); } return true; } @@ -1849,11 +1575,10 @@ static boolean File(PsiBuilder b, int l) { // TopLevelDeclaration* private static boolean File_3(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "File_3")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!TopLevelDeclaration(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "File_3", c)) break; - c = current_position_(b); } return true; } @@ -1911,10 +1636,8 @@ private static boolean ForClause_4(PsiBuilder b, int l) { static boolean ForOrRangeClause(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ForOrRangeClause")) return false; boolean r; - Marker m = enter_section_(b); r = ForClause(b, l + 1); if (!r) r = RangeClause(b, l + 1); - exit_section_(b, m, null, r); return r; } @@ -2119,11 +1842,10 @@ private static boolean ImportList_0(PsiBuilder b, int l) { boolean r; Marker m = enter_section_(b); r = ImportList_0_0(b, l + 1); - int c = current_position_(b); while (r) { + int c = current_position_(b); if (!ImportList_0_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ImportList_0", c)) break; - c = current_position_(b); } exit_section_(b, m, null, r); return r; @@ -2188,11 +1910,10 @@ static boolean ImportSpecs(PsiBuilder b, int l) { // (semi ImportSpec)* private static boolean ImportSpecs_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ImportSpecs_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!ImportSpecs_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ImportSpecs_1", c)) break; - c = current_position_(b); } return true; } @@ -2276,10 +1997,9 @@ public static boolean InterfaceType(PsiBuilder b, int l) { if (!nextTokenIs(b, INTERFACE)) return false; boolean r, p; Marker m = enter_section_(b, l, _NONE_, INTERFACE_TYPE, null); - r = consumeToken(b, INTERFACE); + r = consumeTokens(b, 1, INTERFACE, LBRACE); p = r; // pin = 1 - r = r && report_error_(b, consumeToken(b, LBRACE)); - r = p && report_error_(b, InterfaceType_2(b, l + 1)) && r; + r = r && report_error_(b, InterfaceType_2(b, l + 1)); r = p && consumeToken(b, RBRACE) && r; exit_section_(b, l, m, r, p, null); return r || p; @@ -2426,11 +2146,9 @@ public static boolean LiteralTypeExpr(PsiBuilder b, int l) { static boolean LiteralTypeExprInner(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "LiteralTypeExprInner")) return false; boolean r; - Marker m = enter_section_(b); r = StructType(b, l + 1); if (!r) r = ArrayOrSliceType(b, l + 1); if (!r) r = MapType(b, l + 1); - exit_section_(b, m, null, r); return r; } @@ -2475,10 +2193,9 @@ public static boolean MapType(PsiBuilder b, int l) { if (!nextTokenIs(b, MAP)) return false; boolean r, p; Marker m = enter_section_(b, l, _NONE_, MAP_TYPE, null); - r = consumeToken(b, MAP); + r = consumeTokens(b, 1, MAP, LBRACK); p = r; // pin = 1 - r = r && report_error_(b, consumeToken(b, LBRACK)); - r = p && report_error_(b, Type(b, l + 1)) && r; + r = r && report_error_(b, Type(b, l + 1)); r = p && report_error_(b, consumeToken(b, RBRACK)) && r; r = p && Type(b, l + 1) && r; exit_section_(b, l, m, r, p, null); @@ -2582,11 +2299,10 @@ static boolean MethodSpecs(PsiBuilder b, int l) { // (semi MethodSpec)* private static boolean MethodSpecs_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "MethodSpecs_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!MethodSpecs_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "MethodSpecs_1", c)) break; - c = current_position_(b); } return true; } @@ -2713,11 +2429,10 @@ private static boolean ParamDefinitionListNoPin_1_0_0(PsiBuilder b, int l) { // (',' ParamDefinition)* private static boolean ParamDefinitionListNoPin_2(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ParamDefinitionListNoPin_2")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!ParamDefinitionListNoPin_2_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ParamDefinitionListNoPin_2", c)) break; - c = current_position_(b); } return true; } @@ -2787,11 +2502,10 @@ static boolean ParameterList(PsiBuilder b, int l) { // (',' (ParameterDeclaration | &')'))* private static boolean ParameterList_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "ParameterList_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!ParameterList_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "ParameterList_1", c)) break; - c = current_position_(b); } return true; } @@ -2901,8 +2615,7 @@ public static boolean QualifiedReferenceExpression(PsiBuilder b, int l) { if (!nextTokenIs(b, DOT)) return false; boolean r; Marker m = enter_section_(b, l, _LEFT_, REFERENCE_EXPRESSION, null); - r = consumeToken(b, DOT); - r = r && consumeToken(b, IDENTIFIER); + r = consumeTokens(b, 0, DOT, IDENTIFIER); exit_section_(b, l, m, r, false, null); return r; } @@ -2914,8 +2627,7 @@ public static boolean QualifiedTypeReferenceExpression(PsiBuilder b, int l) { if (!nextTokenIs(b, DOT)) return false; boolean r; Marker m = enter_section_(b, l, _LEFT_, TYPE_REFERENCE_EXPRESSION, null); - r = consumeToken(b, DOT); - r = r && consumeToken(b, IDENTIFIER); + r = consumeTokens(b, 0, DOT, IDENTIFIER); exit_section_(b, l, m, r, false, null); return r; } @@ -3113,10 +2825,9 @@ public static boolean SelectStatement(PsiBuilder b, int l) { if (!nextTokenIs(b, SELECT)) return false; boolean r, p; Marker m = enter_section_(b, l, _NONE_, SELECT_STATEMENT, null); - r = consumeToken(b, SELECT); + r = consumeTokens(b, 1, SELECT, LBRACE); p = r; // pin = 1 - r = r && report_error_(b, consumeToken(b, LBRACE)); - r = p && report_error_(b, SelectStatement_2(b, l + 1)) && r; + r = r && report_error_(b, SelectStatement_2(b, l + 1)); r = p && consumeToken(b, RBRACE) && r; exit_section_(b, l, m, r, p, null); return r || p; @@ -3125,11 +2836,10 @@ public static boolean SelectStatement(PsiBuilder b, int l) { // CommClause* private static boolean SelectStatement_2(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "SelectStatement_2")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!CommClause(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "SelectStatement_2", c)) break; - c = current_position_(b); } return true; } @@ -3222,10 +2932,8 @@ private static boolean SimpleStatement_2_1(PsiBuilder b, int l) { private static boolean SimpleStatement_2_1_0(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "SimpleStatement_2_1_0")) return false; boolean r; - Marker m = enter_section_(b); r = AssignmentStatement(b, l + 1); if (!r) r = SendStatement(b, l + 1); - exit_section_(b, m, null, r); return r; } @@ -3486,11 +3194,10 @@ private static boolean StatementWithSemi_1_1(PsiBuilder b, int l) { // StatementWithSemi* static boolean Statements(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "Statements")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!StatementWithSemi(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "Statements", c)) break; - c = current_position_(b); } return true; } @@ -3515,10 +3222,9 @@ public static boolean StructType(PsiBuilder b, int l) { if (!nextTokenIs(b, STRUCT)) return false; boolean r, p; Marker m = enter_section_(b, l, _NONE_, STRUCT_TYPE, null); - r = consumeToken(b, STRUCT); + r = consumeTokens(b, 1, STRUCT, LBRACE); p = r; // pin = 1 - r = r && report_error_(b, consumeToken(b, LBRACE)); - r = p && report_error_(b, StructType_2(b, l + 1)) && r; + r = r && report_error_(b, StructType_2(b, l + 1)); r = p && consumeToken(b, RBRACE) && r; exit_section_(b, l, m, r, p, null); return r || p; @@ -3561,10 +3267,8 @@ public static boolean SwitchStatement(PsiBuilder b, int l) { private static boolean SwitchStatement_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "SwitchStatement_1")) return false; boolean r; - Marker m = enter_section_(b); r = TypeSwitchStatement(b, l + 1); if (!r) r = ExprSwitchStatement(b, l + 1); - exit_section_(b, m, null, r); return r; } @@ -3589,13 +3293,11 @@ public static boolean Tag(PsiBuilder b, int l) { static boolean TopDeclaration(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "TopDeclaration")) return false; boolean r; - Marker m = enter_section_(b); r = ConstDeclaration(b, l + 1); if (!r) r = TypeDeclaration(b, l + 1); if (!r) r = VarDeclaration(b, l + 1); if (!r) r = FunctionDeclaration(b, l + 1); if (!r) r = MethodDeclaration(b, l + 1); - exit_section_(b, m, null, r); return r; } @@ -3745,10 +3447,8 @@ public static boolean TypeGuard(PsiBuilder b, int l) { if (!nextTokenIs(b, LPAREN)) return false; boolean r, p; Marker m = enter_section_(b, l, _NONE_, TYPE_GUARD, null); - r = consumeToken(b, LPAREN); - r = r && consumeToken(b, TYPE_); + r = consumeTokens(b, 2, LPAREN, TYPE_, RPAREN); p = r; // pin = 2 - r = r && consumeToken(b, RPAREN); exit_section_(b, l, m, r, p, null); return r || p; } @@ -3770,11 +3470,10 @@ public static boolean TypeList(PsiBuilder b, int l) { // ( ',' Type )* private static boolean TypeList_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "TypeList_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!TypeList_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "TypeList_1", c)) break; - c = current_position_(b); } return true; } @@ -3814,11 +3513,10 @@ public static boolean TypeListNoPin(PsiBuilder b, int l) { // ( ',' Type )* private static boolean TypeListNoPin_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "TypeListNoPin_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!TypeListNoPin_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "TypeListNoPin_1", c)) break; - c = current_position_(b); } return true; } @@ -3852,7 +3550,6 @@ private static boolean TypeListNoPin_2(PsiBuilder b, int l) { static boolean TypeLit(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "TypeLit")) return false; boolean r; - Marker m = enter_section_(b); r = ArrayOrSliceType(b, l + 1); if (!r) r = StructType(b, l + 1); if (!r) r = PointerType(b, l + 1); @@ -3860,7 +3557,6 @@ static boolean TypeLit(PsiBuilder b, int l) { if (!r) r = InterfaceType(b, l + 1); if (!r) r = MapType(b, l + 1); if (!r) r = ChannelType(b, l + 1); - exit_section_(b, m, null, r); return r; } @@ -3926,11 +3622,10 @@ static boolean TypeSpecs(PsiBuilder b, int l) { // (semi TypeSpec)* private static boolean TypeSpecs_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "TypeSpecs_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!TypeSpecs_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "TypeSpecs_1", c)) break; - c = current_position_(b); } return true; } @@ -4058,11 +3753,10 @@ private static boolean TypeSwitchStatement_0_1_1(PsiBuilder b, int l) { // ( TypeCaseClause )* private static boolean TypeSwitchStatement_2(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "TypeSwitchStatement_2")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!TypeSwitchStatement_2_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "TypeSwitchStatement_2", c)) break; - c = current_position_(b); } return true; } @@ -4180,11 +3874,10 @@ static boolean VarDefinitionList(PsiBuilder b, int l) { // ( ',' VarDefinition )* private static boolean VarDefinitionList_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "VarDefinitionList_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!VarDefinitionList_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "VarDefinitionList_1", c)) break; - c = current_position_(b); } return true; } @@ -4287,11 +3980,10 @@ static boolean VarSpecs(PsiBuilder b, int l) { // (semi VarSpec)* private static boolean VarSpecs_1(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "VarSpecs_1")) return false; - int c = current_position_(b); while (true) { + int c = current_position_(b); if (!VarSpecs_1_0(b, l + 1)) break; if (!empty_element_parsed_guard_(b, "VarSpecs_1", c)) break; - c = current_position_(b); } return true; } @@ -4536,8 +4228,7 @@ private static boolean TypeAssertionExpr_0(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "TypeAssertionExpr_0")) return false; boolean r; Marker m = enter_section_(b); - r = consumeTokenSmart(b, DOT); - r = r && consumeToken(b, LPAREN); + r = consumeTokensSmart(b, 0, DOT, LPAREN); r = r && TypeAssertionExpr_0_2(b, l + 1); r = r && Type(b, l + 1); r = r && consumeToken(b, RPAREN); @@ -4591,8 +4282,7 @@ private static boolean SelectorExpr_0_1_0(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "SelectorExpr_0_1_0")) return false; boolean r; Marker m = enter_section_(b); - r = consumeTokenSmart(b, LPAREN); - r = r && consumeToken(b, TYPE_); + r = consumeTokensSmart(b, 0, LPAREN, TYPE_); exit_section_(b, m, null, r); return r; } @@ -4615,10 +4305,8 @@ private static boolean IndexOrSliceExpr_0(PsiBuilder b, int l) { private static boolean IndexOrSliceExpr_0_2(PsiBuilder b, int l) { if (!recursion_guard_(b, l, "IndexOrSliceExpr_0_2")) return false; boolean r; - Marker m = enter_section_(b); r = SliceExprBody(b, l + 1); if (!r) r = IndexExprBody(b, l + 1); - exit_section_(b, m, null, r); return r; } @@ -4676,37 +4364,37 @@ public static boolean ParenthesesExpr(PsiBuilder b, int l) { return r || p; } - final static Parser E_recover_parser_ = new Parser() { + static final Parser E_recover_parser_ = new Parser() { public boolean parse(PsiBuilder b, int l) { return E_recover(b, l + 1); } }; - final static Parser Element_parser_ = new Parser() { + static final Parser Element_parser_ = new Parser() { public boolean parse(PsiBuilder b, int l) { return Element(b, l + 1); } }; - final static Parser ExpressionListRecover_parser_ = new Parser() { + static final Parser ExpressionListRecover_parser_ = new Parser() { public boolean parse(PsiBuilder b, int l) { return ExpressionListRecover(b, l + 1); } }; - final static Parser ExpressionOrTypeWithRecover_parser_ = new Parser() { + static final Parser ExpressionOrTypeWithRecover_parser_ = new Parser() { public boolean parse(PsiBuilder b, int l) { return ExpressionOrTypeWithRecover(b, l + 1); } }; - final static Parser StatementRecover_parser_ = new Parser() { + static final Parser StatementRecover_parser_ = new Parser() { public boolean parse(PsiBuilder b, int l) { return StatementRecover(b, l + 1); } }; - final static Parser Statements_parser_ = new Parser() { + static final Parser Statements_parser_ = new Parser() { public boolean parse(PsiBuilder b, int l) { return Statements(b, l + 1); } }; - final static Parser TopLevelDeclarationRecover_parser_ = new Parser() { + static final Parser TopLevelDeclarationRecover_parser_ = new Parser() { public boolean parse(PsiBuilder b, int l) { return TopLevelDeclarationRecover(b, l + 1); } diff --git a/src/main/gen/com/notzippy/intellij/go/parser/GoTypes.java b/src/main/gen/com/notzippy/intellij/go/parser/GoTypes.java index 7e92880d3d..c57f0a0c54 100644 --- a/src/main/gen/com/notzippy/intellij/go/parser/GoTypes.java +++ b/src/main/gen/com/notzippy/intellij/go/parser/GoTypes.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,15 +16,15 @@ */ // This is a generated file. Not intended for manual editing. -package com.goide; +package com.notzippy.intellij.go.parser; import com.intellij.psi.tree.IElementType; import com.intellij.psi.PsiElement; import com.intellij.lang.ASTNode; -import com.goide.psi.GoCompositeElementType; -import com.goide.stubs.GoElementTypeFactory; -import com.goide.psi.GoTokenType; -import com.goide.psi.impl.*; +import com.notzippy.intellij.go.grammar.psi.GoCompositeElementType; +import com.notzippy.intellij.go.stubs.GoElementTypeFactory; +import com.notzippy.intellij.go.grammar.psi.GoTokenType; +import com.notzippy.intellij.go.grammar.psi.impl.*; public interface GoTypes { @@ -216,7 +217,7 @@ public interface GoTypes { class Factory { public static PsiElement createElement(ASTNode node) { IElementType type = node.getElementType(); - if (type == ADD_EXPR) { + if (type == ADD_EXPR) { return new GoAddExprImpl(node); } else if (type == AND_EXPR) { @@ -291,9 +292,6 @@ else if (type == ELEMENT) { else if (type == ELSE_STATEMENT) { return new GoElseStatementImpl(node); } - else if (type == EXPRESSION) { - return new GoExpressionImpl(node); - } else if (type == EXPR_CASE_CLAUSE) { return new GoExprCaseClauseImpl(node); } diff --git a/src/main/java/HelloAction.java b/src/main/java/HelloAction.java new file mode 100644 index 0000000000..5b8be01c81 --- /dev/null +++ b/src/main/java/HelloAction.java @@ -0,0 +1,14 @@ +import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.Messages; + +public class HelloAction extends AnAction { + public HelloAction() { + super("Hello"); + } + + public void actionPerformed(AnActionEvent event) { + Project project = event.getProject(); + Messages.showMessageDialog(project, "Hello world!", "Greeting", Messages.getInformationIcon()); + } +} \ No newline at end of file diff --git a/src/main/java/com/notzippy/intellij/go/goide/GoEnvironmentUtil.java b/src/main/java/com/notzippy/intellij/go/goide/GoEnvironmentUtil.java index 987e5cc535..7dd5205ce9 100644 --- a/src/main/java/com/notzippy/intellij/go/goide/GoEnvironmentUtil.java +++ b/src/main/java/com/notzippy/intellij/go/goide/GoEnvironmentUtil.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.goide; +import com.notzippy.intellij.go.intellij.GoConstants; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.util.SystemInfo; diff --git a/src/main/java/com/notzippy/intellij/go/goide/GoLibrariesState.java b/src/main/java/com/notzippy/intellij/go/goide/GoLibrariesState.java index 0ed782dcc5..6a2d0ddf36 100644 --- a/src/main/java/com/notzippy/intellij/go/goide/GoLibrariesState.java +++ b/src/main/java/com/notzippy/intellij/go/goide/GoLibrariesState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.goide; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/copyrightHeader.java b/src/main/java/com/notzippy/intellij/go/grammar/copyrightHeader.java index eb2e27ef7f..55484b2242 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/copyrightHeader.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/copyrightHeader.java @@ -1,4 +1,5 @@ /* + * Copyright 2019-2020 Not zippy * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/com/notzippy/intellij/go/grammar/go.bnf b/src/main/java/com/notzippy/intellij/go/grammar/go.bnf index c7e252a0c1..3aab5dd480 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/go.bnf +++ b/src/main/java/com/notzippy/intellij/go/grammar/go.bnf @@ -1,21 +1,21 @@ { - parserClass='com.goide.parser.GoParser' + parserClass='com.notzippy.intellij.go.parser.GoParser' classHeader='copyrightHeader.java' - implements='com.goide.psi.GoCompositeElement' - extends='com.goide.psi.impl.GoCompositeElementImpl' + implements='com.notzippy.intellij.go.grammar.psi.GoCompositeElement' + extends='com.notzippy.intellij.go.grammar.psi.impl.GoCompositeElementImpl' - elementTypeHolderClass='com.goide.GoTypes' - elementTypeClass='com.goide.psi.GoCompositeElementType' - tokenTypeClass='com.goide.psi.GoTokenType' - psiTreeUtilClass='com.goide.psi.GoPsiTreeUtil' + elementTypeHolderClass='com.notzippy.intellij.go.parser.GoTypes' + elementTypeClass='com.notzippy.intellij.go.grammar.psi.GoCompositeElementType' + tokenTypeClass='com.notzippy.intellij.go.grammar.psi.GoTokenType' + psiTreeUtilClass='com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil' psiClassPrefix='Go' psiImplClassSuffix='Impl' - psiPackage='com.goide.psi' - psiImplPackage='com.goide.psi.impl' - psiImplUtilClass="com.goide.psi.impl.GoPsiImplUtil" - parserUtilClass="com.goide.parser.GoParserUtil" + psiPackage='com.notzippy.intellij.go.grammar.psi' + psiImplPackage='com.notzippy.intellij.go.grammar.psi.impl' + psiImplUtilClass="com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil" + parserUtilClass="com.notzippy.intellij.go.parser.GoParserUtil" tokens=[ LBRACE = '{' @@ -73,16 +73,16 @@ extends("(Or|And|Add|Conversion|Mul|Selector|Conditional)Expr")=BinaryExpr extends(".*(Expr|Literal|Lit|OperandName)")=Expression - implements("(Type|Import)Spec|(Var|Const|Param|(Anonymous)?Field|Label)Definition|Receiver")="com.goide.psi.GoNamedElement" - implements("FunctionLit")="com.goide.psi.GoSignatureOwner" - implements("MethodSpec")="com.goide.psi.GoNamedSignatureOwner" - implements("(Function|Method)Declaration")="com.goide.psi.GoFunctionOrMethodDeclaration" - implements("(Const|Type|Var)Declaration")="com.goide.psi.GoTopLevelDeclaration" - implements(".*ReferenceExpression|FieldName")="com.goide.psi.GoReferenceExpressionBase" - extends("(Function|Method)Declaration")="com.goide.psi.impl.GoFunctionOrMethodDeclarationImpl" - extends("(Type|Import|Method)Spec|(Var|Const|Param|(Anonymous)?Field|Label)Definition|Receiver")="com.goide.psi.impl.GoNamedElementImpl" - extends("PackageClause|Parameters|Signature|ParameterDeclaration|Result|Type|(Const|Var|Import)Spec")="com.goide.psi.impl.GoStubbedElementImpl" - elementTypeFactory("PackageClause|(Function|Method|Parameter)Declaration|(Type|Import|Method|Const|Var)Spec|RangeClause|RecvStatement|ShortVarDeclaration|(Var|Const|Param|(Anonymous)?Field|Label)Definition|Receiver|Parameters|Signature|Result|.*Type|TypeList.*")='com.goide.stubs.GoElementTypeFactory.stubFactory' + implements("(Type|Import)Spec|(Var|Const|Param|(Anonymous)?Field|Label)Definition|Receiver")="com.notzippy.intellij.go.grammar.psi.GoNamedElement" + implements("FunctionLit")="com.notzippy.intellij.go.grammar.psi.GoSignatureOwner" + implements("MethodSpec")="com.notzippy.intellij.go.grammar.psi.GoNamedSignatureOwner" + implements("(Function|Method)Declaration")="com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration" + implements("(Const|Type|Var)Declaration")="com.notzippy.intellij.go.grammar.psi.GoTopLevelDeclaration" + implements(".*ReferenceExpression|FieldName")="com.notzippy.intellij.go.grammar.psi.GoReferenceExpressionBase" + extends("(Function|Method)Declaration")="com.notzippy.intellij.go.grammar.psi.impl.GoFunctionOrMethodDeclarationImpl" + extends("(Type|Import|Method)Spec|(Var|Const|Param|(Anonymous)?Field|Label)Definition|Receiver")="com.notzippy.intellij.go.grammar.psi.impl.GoNamedElementImpl" + extends("PackageClause|Parameters|Signature|ParameterDeclaration|Result|Type|(Const|Var|Import)Spec")="com.notzippy.intellij.go.grammar.psi.impl.GoStubbedElementImpl" + elementTypeFactory("PackageClause|(Function|Method|Parameter)Declaration|(Type|Import|Method|Const|Var)Spec|RangeClause|RecvStatement|ShortVarDeclaration|(Var|Const|Param|(Anonymous)?Field|Label)Definition|Receiver|Parameters|Signature|Result|.*Type|TypeList.*")='com.notzippy.intellij.go.stubs.GoElementTypeFactory.stubFactory' pin(".*Statement")=1 extends(".*Statement")=Statement extends(".*Type|TypeList")=Type @@ -98,7 +98,7 @@ ImportList ::= (ImportDeclaration semi)+|<> { } private semi ::= '' | ';' | <> -PackageClause ::= package identifier {pin=1 methods=[getName] stubClass="com.goide.stubs.GoPackageClauseStub"} +PackageClause ::= package identifier {pin=1 methods=[getName] stubClass="com.notzippy.intellij.go.stubs.GoPackageClauseStub"} ImportDeclaration ::= import ( ImportSpec | '(' ImportSpecs? ')' ) { pin(".*")=1 @@ -106,12 +106,12 @@ ImportDeclaration ::= import ( ImportSpec | '(' ImportSpecs? ')' ) { } private ImportSpecs ::= ImportSpec (semi ImportSpec)* semi? {pin=1} ImportSpec ::= [ '.' | identifier ] ImportString { - stubClass="com.goide.stubs.GoImportSpecStub" + stubClass="com.notzippy.intellij.go.stubs.GoImportSpecStub" methods=[getAlias getLocalPackageName shouldGoDeeper isForSideEffects isDot getPath getName isCImport] } ImportString ::= StringLiteral {methods=[getReferences resolve getPath getPathTextRange]} -Type ::= TypeName | TypeLit | ParType {stubClass="com.goide.stubs.GoTypeStub" methods=[getUnderlyingType shouldGoDeeper]} +Type ::= TypeName | TypeLit | ParType {stubClass="com.notzippy.intellij.go.stubs.GoTypeStub" methods=[getUnderlyingType shouldGoDeeper]} ParType ::= '(' Type ')' {methods=[getActualType]} private TypeName ::= TypeReferenceExpression QualifiedTypeReferenceExpression? TypeReferenceExpression ::= identifier { methods=[getReference getQualifier resolve resolveType] } @@ -134,37 +134,37 @@ FieldDeclaration ::= (FieldDefinitionList Type | AnonymousFieldDefinition) Tag? Tag ::= StringLiteral private FieldDefinitionList ::= FieldDefinition (',' FieldDefinition)* FieldDefinition ::= identifier { - stubClass="com.goide.stubs.GoFieldDefinitionStub" + stubClass="com.notzippy.intellij.go.stubs.GoFieldDefinitionStub" } AnonymousFieldDefinition ::= Type { - stubClass="com.goide.stubs.GoAnonymousFieldDefinitionStub" + stubClass="com.notzippy.intellij.go.stubs.GoAnonymousFieldDefinitionStub" methods=[getIdentifier getName getTypeReferenceExpression getGoTypeInner] } PointerType ::= '*' Type {pin=1} -FunctionType ::= func Signature {pin=1 implements="com.goide.psi.GoSignatureOwner"} +FunctionType ::= func Signature {pin=1 implements="com.notzippy.intellij.go.grammar.psi.GoSignatureOwner"} Signature ::= Parameters Result? { pin=1 - stubClass="com.goide.stubs.GoSignatureStub" + stubClass="com.notzippy.intellij.go.stubs.GoSignatureStub" } Result ::= '(' TypeListNoPin ')' | Type | Parameters { // todo: reorder and pin ( - stubClass="com.goide.stubs.GoResultStub" + stubClass="com.notzippy.intellij.go.stubs.GoResultStub" methods=[isVoid] } Parameters ::= '(' [ (ParameterList ','?| TypeListNoPin) ] ')' { pin=1 - stubClass="com.goide.stubs.GoParametersStub" + stubClass="com.notzippy.intellij.go.stubs.GoParametersStub" } private ParameterList ::= ParameterDeclaration (',' (ParameterDeclaration | &')'))* {pin(".*")=1} ParameterDeclaration ::= ParamDefinitionListNoPin? '...'? Type | Type { // todo: use left rule - stubClass="com.goide.stubs.GoParameterDeclarationStub" + stubClass="com.notzippy.intellij.go.stubs.GoParameterDeclarationStub" methods = [isVariadic] } private ParamDefinitionListNoPin ::= ParamDefinition &(!('.' | ')')) (',' ParamDefinition)* // todo ParamDefinition ::= identifier { - stubClass="com.goide.stubs.GoParamDefinitionStub" + stubClass="com.notzippy.intellij.go.stubs.GoParamDefinitionStub" methods = [isVariadic] } @@ -174,7 +174,7 @@ InterfaceType ::= interface '{' MethodSpecs? '}' { } private MethodSpecs ::= MethodSpec (semi MethodSpec)* semi? {pin=1} MethodSpec ::= TypeName &(!'(') | identifier Signature { - stubClass="com.goide.stubs.GoMethodSpecStub" + stubClass="com.notzippy.intellij.go.stubs.GoMethodSpecStub" methods=[getGoTypeInner getName] } @@ -233,12 +233,12 @@ ConstDeclaration ::= const ( ConstSpec | '(' ConstSpecs? ')' ) {pin(".*")=1 meth private ConstSpecs ::= ConstSpec (semi ConstSpec)* semi? {pin=1} ConstSpec ::= ConstDefinitionList [ ('=' ExpressionList | Type '=' ExpressionList) ] { pin(".*")=1 - stubClass="com.goide.stubs.GoConstSpecStub" + stubClass="com.notzippy.intellij.go.stubs.GoConstSpecStub" methods=[deleteDefinition] } private ConstDefinitionList ::= ConstDefinition ( ',' ConstDefinition )* ConstDefinition ::= identifier { - stubClass="com.goide.stubs.GoConstDefinitionStub" + stubClass="com.notzippy.intellij.go.stubs.GoConstDefinitionStub" methods=[getGoTypeInner getValue] } @@ -256,38 +256,38 @@ TypeDeclaration ::= 'type' ( TypeSpec | '(' TypeSpecs? ')' ) {pin(".*")=1} private TypeSpecs ::= TypeSpec (semi TypeSpec)* semi? {pin=1} TypeSpec ::= SpecType { methods=[getGoTypeInner getMethods shouldGoDeeper identifier="SpecType/identifier"] - stubClass="com.goide.stubs.GoTypeSpecStub" + stubClass="com.notzippy.intellij.go.stubs.GoTypeSpecStub" } -SpecType ::= identifier Type {pin=1 stubClass="com.goide.stubs.GoTypeStub" extends="com.goide.psi.impl.GoTypeImpl" implements=Type} +SpecType ::= identifier Type {pin=1 stubClass="com.notzippy.intellij.go.stubs.GoTypeStub" extends="com.notzippy.intellij.go.grammar.psi.impl.GoTypeImpl" implements=Type} VarDeclaration ::= var ( VarSpec | '(' VarSpecs? ')' ) {pin(".*")=1 methods=[addSpec deleteSpec]} private VarSpecs ::= VarSpec (semi VarSpec)* semi? {pin=1} VarSpec ::= VarDefinitionList ( Type [ '=' ExpressionList ] | '=' ExpressionList ) { pin(".*")=1 methods=[processDeclarations deleteDefinition getRightExpressionsList] - stubClass="com.goide.stubs.GoVarSpecStub" + stubClass="com.notzippy.intellij.go.stubs.GoVarSpecStub" } private VarDefinitionList ::= VarDefinition ( ',' VarDefinition )* VarDefinition ::= identifier { methods=[getGoTypeInner getReference getValue] - stubClass="com.goide.stubs.GoVarDefinitionStub" + stubClass="com.notzippy.intellij.go.stubs.GoVarDefinitionStub" } ShortVarDeclaration ::= VarDefinitionList ':=' ExpressionList {pin=2 extends=VarSpec} FunctionDeclaration ::= func identifier Signature BlockWithConsume? { pin=2 - stubClass="com.goide.stubs.GoFunctionDeclarationStub" + stubClass="com.notzippy.intellij.go.stubs.GoFunctionDeclarationStub" } MethodDeclaration ::= func Receiver identifier Signature BlockWithConsume? { pin=1 - stubClass="com.goide.stubs.GoMethodDeclarationStub" + stubClass="com.notzippy.intellij.go.stubs.GoMethodDeclarationStub" methods=[getReceiverType] } Receiver ::= '(' (identifier ReceiverTail | ReceiverTail) ')' { methods=[getGoTypeInner] pin=1 - stubClass="com.goide.stubs.GoReceiverStub" + stubClass="com.notzippy.intellij.go.stubs.GoReceiverStub" } private ReceiverTail ::= Type ','? @@ -336,7 +336,7 @@ Expression ::= | UnaryExpr | ConversionExpr | MaxGroup - | ParenthesesExpr {methods=[getGoType] implements="com.goide.psi.GoTypeOwner"} + | ParenthesesExpr {methods=[getGoType] implements="com.notzippy.intellij.go.grammar.psi.GoTypeOwner"} fake BinaryExpr ::= Expression+ { methods=[left="Expression[0]" right="Expression[1]" getOperator] @@ -386,7 +386,7 @@ private ConversionStart ::= '*' | '<-' | '[' | chan | func | interface | map | s LabeledStatement ::= LabelDefinition ':' Statement? {pin=2} LabelDefinition ::= identifier { - stubClass="com.goide.stubs.GoLabelDefinitionStub" // todo: remove when you'll have some spare time + stubClass="com.notzippy.intellij.go.stubs.GoLabelDefinitionStub" // todo: remove when you'll have some spare time } left SendStatement ::= '<-' Expression {pin=1 methods=[getSendExpression]} left AssignmentStatement ::= assign_op ExpressionList {pin=1} @@ -401,12 +401,12 @@ left ExprSwitchStatement ::= Condition '{' ExprCaseClause* '}' {pin=2 extends=Sw private Condition ::= <> SimpleStatementOpt Expression? <> private SimpleStatementOpt ::= [SimpleStatement ';'?] // todo: remove ? -ExprCaseClause ::= !'}' ExprSwitchCase ':' Statements? {pin=1 implements="com.goide.psi.GoCaseClause"} +ExprCaseClause ::= !'}' ExprSwitchCase ':' Statements? {pin=1 implements="com.notzippy.intellij.go.grammar.psi.GoCaseClause"} private ExprSwitchCase ::= case ExpressionList | default {pin(".*")=1} left TypeSwitchStatement ::= (TypeSwitchGuard | SimpleStatement ';'? TypeSwitchGuard) '{' ( TypeCaseClause )* '}' {pin=1 extends=SwitchStatement} TypeSwitchGuard ::= [ VarDefinition ':=' ] Expression '.' TypeGuard TypeGuard ::= '(' 'type' ')' {pin=2} -TypeCaseClause ::= !'}' TypeSwitchCase ':' Statements? {pin=1 implements="com.goide.psi.GoCaseClause"} +TypeCaseClause ::= !'}' TypeSwitchCase ':' Statements? {pin=1 implements="com.notzippy.intellij.go.grammar.psi.GoCaseClause"} private TypeSwitchCase ::= case TypeList | default {pin(".*")=1} TypeList ::= Type ( ',' Type )* ','? TypeListNoPin ::= Type ( ',' Type )* ','? {elementType=TypeList} diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCaseClause.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCaseClause.java index 721ac0039a..139838441f 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCaseClause.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCaseClause.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCompositeElement.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCompositeElement.java index 1904fb39f2..f611ae8121 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCompositeElement.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCompositeElement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCompositeElementType.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCompositeElementType.java index 7eb0c9d7f4..64fc6705ac 100755 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCompositeElementType.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoCompositeElementType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; -import com.goide.GoLanguage; +import com.notzippy.intellij.go.intellij.GoLanguage; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoFile.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoFile.java index e57f45ac13..a5767ebcf9 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoFile.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoFile.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.goide.psi; - -import com.goide.GoConstants; -import com.goide.GoFileType; -import com.goide.GoLanguage; -import com.goide.GoTypes; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.sdk.GoPackageUtil; -import com.goide.sdk.GoSdkUtil; -import com.goide.stubs.GoConstSpecStub; -import com.goide.stubs.GoFileStub; -import com.goide.stubs.GoVarSpecStub; -import com.goide.stubs.types.*; -import com.goide.util.GoUtil; +package com.notzippy.intellij.go.grammar.psi; + +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.intellij.GoLanguage; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; +import com.notzippy.intellij.go.stubs.GoConstSpecStub; +import com.notzippy.intellij.go.stubs.GoFileStub; +import com.notzippy.intellij.go.stubs.GoVarSpecStub; +import com.notzippy.intellij.go.stubs.types.*; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.extapi.psi.PsiFileBase; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoFunctionOrMethodDeclaration.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoFunctionOrMethodDeclaration.java index 103c08d062..073b0899bc 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoFunctionOrMethodDeclaration.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoFunctionOrMethodDeclaration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoNamedElement.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoNamedElement.java index eeb58c92be..c98a8dda38 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoNamedElement.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoNamedElement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import com.intellij.navigation.NavigationItem; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoNamedSignatureOwner.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoNamedSignatureOwner.java index bd08e1f366..412bd73b82 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoNamedSignatureOwner.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoNamedSignatureOwner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; public interface GoNamedSignatureOwner extends GoNamedElement, GoSignatureOwner { } diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoPsiTreeUtil.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoPsiTreeUtil.java index 04cb2176d9..ee237f9f74 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoPsiTreeUtil.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoPsiTreeUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.Couple; @@ -52,25 +52,6 @@ public static T getStubChildOfType(@Nullable PsiElement e return null; } - @NotNull - public static List getStubChildrenOfTypeAsList(@Nullable PsiElement element, @NotNull Class aClass) { - if (element == null) return Collections.emptyList(); - StubElement stub = element instanceof StubBasedPsiElement ? ((StubBasedPsiElement)element).getStub() : null; - if (stub == null) { - return getChildrenOfTypeAsList(element, aClass); - } - - List result = new SmartList(); - for (StubElement childStub : stub.getChildrenStubs()) { - PsiElement child = childStub.getPsi(); - if (aClass.isInstance(child)) { - //noinspection unchecked - result.add((T)child); - } - } - return result; - } - @Nullable private static Couple getElementRange(@NotNull GoFile file, int startOffset, int endOffset) { PsiElement startElement = findNotWhiteSpaceElementAtOffset(file, startOffset, true); diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoRecursiveVisitor.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoRecursiveVisitor.java index 059730d974..eeb3a62aeb 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoRecursiveVisitor.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoRecursiveVisitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoReferenceExpressionBase.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoReferenceExpressionBase.java index b23ace7875..574e09e677 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoReferenceExpressionBase.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoReferenceExpressionBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoSignatureOwner.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoSignatureOwner.java index f7acda7f3f..c54a864589 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoSignatureOwner.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoSignatureOwner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTokenType.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTokenType.java index 6628a1d4c2..cce40abcf5 100755 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTokenType.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTokenType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; -import com.goide.GoLanguage; +import com.notzippy.intellij.go.intellij.GoLanguage; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTopLevelDeclaration.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTopLevelDeclaration.java index 012eef9bec..5228811770 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTopLevelDeclaration.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTopLevelDeclaration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; public interface GoTopLevelDeclaration extends GoCompositeElement { } diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTypeOwner.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTypeOwner.java index fae1ef9af3..fc6e8441b2 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTypeOwner.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/GoTypeOwner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.grammar.psi; import com.intellij.psi.ResolveState; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCType.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCType.java index f692e58a5c..a0cf62f161 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCType.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.GoCompositeElement; +import com.notzippy.intellij.go.grammar.psi.GoCompositeElement; import org.jetbrains.annotations.NotNull; public class GoCType extends GoLightType { diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCachedReference.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCachedReference.java index 41156f853b..d54e244a0c 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCachedReference.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCachedReference.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReferenceBase; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCompositeElementImpl.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCompositeElementImpl.java index 98404d9211..58f4b15488 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCompositeElementImpl.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoCompositeElementImpl.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoElementFactory.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoElementFactory.java index a9c4939ad2..47fa85b64c 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoElementFactory.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoElementFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.GoLanguage; -import com.goide.psi.*; +import com.notzippy.intellij.go.intellij.GoLanguage; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoExpressionUtil.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoExpressionUtil.java index 366e624248..8277bbdc61 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoExpressionUtil.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoExpressionUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Trinity; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoFieldNameReference.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoFieldNameReference.java index 297eaca314..9ca06962f1 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoFieldNameReference.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoFieldNameReference.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionOrMethodDeclarationImpl.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionOrMethodDeclarationImpl.java index e0ec72c531..1ae0aa7f09 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionOrMethodDeclarationImpl.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoFunctionOrMethodDeclarationImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.GoType; -import com.goide.stubs.GoFunctionOrMethodDeclarationStub; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoType; +import com.notzippy.intellij.go.stubs.GoFunctionOrMethodDeclarationStub; import com.intellij.lang.ASTNode; import com.intellij.psi.ResolveState; import com.intellij.psi.stubs.IStubElementType; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoLabelReference.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoLabelReference.java index 0464f8e1aa..fa29693f84 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoLabelReference.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoLabelReference.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveState; import com.intellij.psi.util.PsiTreeUtil; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoLightType.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoLightType.java index 4a67e66fc1..bba7d488d3 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoLightType.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoLightType.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.*; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.stubs.GoTypeStub; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.impl.light.LightElement; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoNamedElementImpl.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoNamedElementImpl.java index e9eaf1bc27..df1546e395 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoNamedElementImpl.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoNamedElementImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.psi.impl; - -import com.goide.GoIcons; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.*; -import com.goide.sdk.GoPackageUtil; -import com.goide.stubs.GoNamedStub; -import com.goide.util.GoUtil; +package com.notzippy.intellij.go.grammar.psi.impl; + +import com.notzippy.intellij.go.intellij.GoIcons; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.stubs.GoNamedStub; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.lang.ASTNode; import com.intellij.navigation.ItemPresentation; import com.intellij.openapi.module.ModuleUtilCore; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoPsiImplUtil.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoPsiImplUtil.java index 9a64f17293..0e7bce21f3 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoPsiImplUtil.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoPsiImplUtil.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.goide.psi.impl; - -import com.goide.GoConstants; -import com.goide.GoTypes; -import com.goide.psi.*; -import com.goide.psi.impl.imports.GoImportReferenceSet; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.sdk.GoPackageUtil; -import com.goide.sdk.GoSdkUtil; -import com.goide.stubs.*; -import com.goide.stubs.index.GoIdFilter; -import com.goide.stubs.index.GoMethodIndex; -import com.goide.util.GoStringLiteralEscaper; -import com.goide.util.GoUtil; +package com.notzippy.intellij.go.grammar.psi.impl; + +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.imports.GoImportReferenceSet; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; +import com.notzippy.intellij.go.stubs.*; +import com.notzippy.intellij.go.stubs.index.GoIdFilter; +import com.notzippy.intellij.go.stubs.index.GoMethodIndex; +import com.notzippy.intellij.go.parser.GoStringLiteralEscaper; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector; import com.intellij.diagnostic.AttachmentFactory; import com.intellij.lang.ASTNode; @@ -62,7 +62,7 @@ import java.util.Collections; import java.util.List; -import static com.goide.psi.impl.GoLightType.*; +import static com.notzippy.intellij.go.grammar.psi.impl.GoLightType.*; import static com.intellij.codeInsight.highlighting.ReadWriteAccessDetector.Access.*; import static com.intellij.openapi.util.Conditions.equalTo; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoReference.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoReference.java index e053a706a1..92bee3fea3 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoReference.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoReference.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.GoConstants; -import com.goide.psi.*; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.util.*; import com.intellij.psi.*; @@ -35,7 +35,7 @@ import java.util.Collection; import java.util.List; -import static com.goide.psi.impl.GoPsiImplUtil.*; +import static com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil.*; public class GoReference extends GoReferenceBase { private static final Key POINTER = Key.create("POINTER"); diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoReferenceBase.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoReferenceBase.java index c6f31d9a96..9a81c6e2a9 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoReferenceBase.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoReferenceBase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.*; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.util.Comparing; @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; -import static com.goide.psi.impl.GoPsiImplUtil.allowed; +import static com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil.allowed; public abstract class GoReferenceBase extends PsiPolyVariantReferenceBase { public static final Key> IMPORT_USERS = Key.create("IMPORT_USERS"); diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoScopeProcessor.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoScopeProcessor.java index 590196cb19..7491e9df79 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoScopeProcessor.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoScopeProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; import com.intellij.psi.scope.BaseScopeProcessor; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoScopeProcessorBase.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoScopeProcessorBase.java index 1cd0d9d594..0db7950553 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoScopeProcessorBase.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoScopeProcessorBase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveState; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoStubbedElementImpl.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoStubbedElementImpl.java index 30c8a33a3b..7c14a0f8d4 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoStubbedElementImpl.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoStubbedElementImpl.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.GoCompositeElement; -import com.goide.psi.GoFile; -import com.goide.stubs.TextHolder; +import com.notzippy.intellij.go.grammar.psi.GoCompositeElement; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.stubs.TextHolder; import com.intellij.extapi.psi.StubBasedPsiElementBase; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeProcessor.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeProcessor.java index 20a456671a..5e8bbdd99b 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeProcessor.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeProcessor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.GoTypeReferenceExpression; -import com.goide.psi.GoTypeSpec; +import com.notzippy.intellij.go.grammar.psi.GoTypeReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeReference.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeReference.java index fdf7028bfb..d2c19877c3 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeReference.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeReference.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.GoConstants; -import com.goide.GoTypes; -import com.goide.psi.*; -import com.goide.sdk.GoSdkUtil; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeUtil.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeUtil.java index a0075e139a..ec04477d5a 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeUtil.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoTypeUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.GoConstants; -import com.goide.psi.*; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoVarProcessor.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoVarProcessor.java index 07ce1a7f44..5d34b892c6 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoVarProcessor.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoVarProcessor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.openapi.util.Comparing; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoVarReference.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoVarReference.java index 6d73991cb2..e63af4b9c6 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoVarReference.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/GoVarReference.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.GoBlock; -import com.goide.psi.GoFieldDefinition; -import com.goide.psi.GoStatement; -import com.goide.psi.GoVarDefinition; +import com.notzippy.intellij.go.grammar.psi.GoBlock; +import com.notzippy.intellij.go.grammar.psi.GoFieldDefinition; +import com.notzippy.intellij.go.grammar.psi.GoStatement; +import com.notzippy.intellij.go.grammar.psi.GoVarDefinition; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveState; import com.intellij.psi.util.PsiTreeUtil; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/ResolveUtil.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/ResolveUtil.java index e0a3e5d097..d6fc991f08 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/ResolveUtil.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/ResolveUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.grammar.psi.impl; -import com.goide.psi.GoCompositeElement; +import com.notzippy.intellij.go.grammar.psi.GoCompositeElement; import com.intellij.psi.PsiElement; import com.intellij.psi.ResolveState; import com.intellij.psi.scope.PsiScopeProcessor; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoImportReference.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoImportReference.java index 6df03b38fd..32934418ac 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoImportReference.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoImportReference.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.psi.impl.imports; +package com.notzippy.intellij.go.grammar.psi.impl.imports; -import com.goide.codeInsight.imports.GoGetPackageFix; -import com.goide.completion.GoCompletionUtil; -import com.goide.quickfix.GoDeleteImportQuickFix; -import com.goide.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.codeInsight.imports.GoGetPackageFix; +import com.notzippy.intellij.go.intellij.completion.GoCompletionUtil; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteImportQuickFix; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; import com.intellij.codeInsight.completion.CompletionUtil; import com.intellij.codeInsight.daemon.quickFix.CreateFileFix; import com.intellij.codeInspection.LocalQuickFix; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoImportReferenceSet.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoImportReferenceSet.java index 3fc8ddfd5d..6918eecf56 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoImportReferenceSet.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoImportReferenceSet.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.psi.impl.imports; +package com.notzippy.intellij.go.grammar.psi.impl.imports; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.GoImportString; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.GoImportString; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoReferenceImporter.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoReferenceImporter.java index b99925427e..b8cbf1a075 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoReferenceImporter.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/imports/GoReferenceImporter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.psi.impl.imports; +package com.notzippy.intellij.go.grammar.psi.impl.imports; -import com.goide.GoLanguage; -import com.goide.codeInsight.imports.GoImportPackageQuickFix; -import com.goide.psi.GoCompositeElement; +import com.notzippy.intellij.go.intellij.GoLanguage; +import com.notzippy.intellij.go.intellij.codeInsight.imports.GoImportPackageQuickFix; +import com.notzippy.intellij.go.grammar.psi.GoCompositeElement; import com.intellij.codeInsight.daemon.ReferenceImporter; import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil; import com.intellij.codeInsight.daemon.impl.DaemonListeners; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/manipulator/GoImportStringManipulator.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/manipulator/GoImportStringManipulator.java index 4de4fa42f9..e5a3dd02b4 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/manipulator/GoImportStringManipulator.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/manipulator/GoImportStringManipulator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.psi.impl.manipulator; +package com.notzippy.intellij.go.grammar.psi.impl.manipulator; -import com.goide.psi.GoImportString; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoImportString; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.openapi.util.TextRange; import com.intellij.psi.AbstractElementManipulator; import com.intellij.util.IncorrectOperationException; diff --git a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/manipulator/GoStringManipulator.java b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/manipulator/GoStringManipulator.java index ec86825df7..6b622df53b 100644 --- a/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/manipulator/GoStringManipulator.java +++ b/src/main/java/com/notzippy/intellij/go/grammar/psi/impl/manipulator/GoStringManipulator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.impl.manipulator; +package com.notzippy.intellij.go.grammar.psi.impl.manipulator; -import com.goide.psi.impl.GoStringLiteralImpl; +import com.notzippy.intellij.go.grammar.psi.impl.GoStringLiteralImpl; import com.intellij.openapi.util.TextRange; import com.intellij.psi.AbstractElementManipulator; import com.intellij.util.IncorrectOperationException; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoCommenter.java b/src/main/java/com/notzippy/intellij/go/intellij/GoCommenter.java index ef0691df4b..52101c7041 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoCommenter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoCommenter.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; +import com.notzippy.intellij.go.intellij.GoParserDefinition; import com.intellij.lang.CodeDocumentationAwareCommenter; import com.intellij.psi.PsiComment; import com.intellij.psi.tree.IElementType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoCommentsConverter.java b/src/main/java/com/notzippy/intellij/go/intellij/GoCommentsConverter.java index ffda6e1a08..fa8db51f63 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoCommentsConverter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoCommentsConverter.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; +import com.notzippy.intellij.go.intellij.GoParserDefinition; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiComment; import com.intellij.psi.tree.IElementType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoConstants.java b/src/main/java/com/notzippy/intellij/go/intellij/GoConstants.java index 319b2cc9fc..476814785f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoConstants.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; import com.intellij.notification.NotificationGroup; import com.intellij.openapi.wm.ToolWindowId; @@ -32,7 +32,7 @@ public class GoConstants { public static final String GO_VENDORING_EXPERIMENT = "GO15VENDOREXPERIMENT"; public static final String GO_LIBRARIES_SERVICE_NAME = "GoLibraries"; public static final String GO_LIBRARIES_CONFIG_FILE = "goLibraries.xml"; - public static final String GO_MODULE_SESTTINGS_SERVICE_NAME = "Go"; + public static final String GO_MODULE_SESTTINGS_SERVICE_NAME = "go"; private static final String IDENTIFIER_REGEX = "[\\p{javaLetter}_][\\p{javaLetterOrDigit}_]*"; public static final String TEST_NAME_REGEX = IDENTIFIER_REGEX + "(/\\S*)?"; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoDocumentationProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/GoDocumentationProvider.java index 034045a88e..f6a27a023c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoDocumentationProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoDocumentationProvider.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.goide; - -import com.goide.editor.GoParameterInfoHandler; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.*; -import com.goide.psi.impl.GoCType; -import com.goide.psi.impl.GoLightType; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.sdk.GoPackageUtil; -import com.goide.sdk.GoSdkUtil; -import com.goide.stubs.index.GoAllPrivateNamesIndex; -import com.goide.stubs.index.GoAllPublicNamesIndex; -import com.goide.stubs.index.GoIdFilter; -import com.goide.util.GoUtil; +package com.notzippy.intellij.go.intellij; + +import com.notzippy.intellij.go.intellij.editor.GoParameterInfoHandler; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoCType; +import com.notzippy.intellij.go.grammar.psi.impl.GoLightType; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; +import com.notzippy.intellij.go.stubs.index.GoAllPrivateNamesIndex; +import com.notzippy.intellij.go.stubs.index.GoAllPublicNamesIndex; +import com.notzippy.intellij.go.stubs.index.GoIdFilter; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.codeInsight.documentation.DocumentationManagerProtocol; import com.intellij.lang.ASTNode; import com.intellij.lang.documentation.AbstractDocumentationProvider; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoFileElementType.java b/src/main/java/com/notzippy/intellij/go/intellij/GoFileElementType.java index ae8aea3a5c..fb5d793388 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoFileElementType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoFileElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; -import com.goide.psi.GoFile; -import com.goide.stubs.GoFileStub; -import com.goide.stubs.index.GoPackagesIndex; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.stubs.GoFileStub; +import com.notzippy.intellij.go.stubs.index.GoPackagesIndex; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiFile; import com.intellij.psi.StubBuilder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoFileType.java b/src/main/java/com/notzippy/intellij/go/intellij/GoFileType.java index fdabfe5472..885742acea 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoFileType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoFileType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoFileTypeFactory.java b/src/main/java/com/notzippy/intellij/go/intellij/GoFileTypeFactory.java index 9dfe8ead01..132613bf08 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoFileTypeFactory.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoFileTypeFactory.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; +import com.notzippy.intellij.go.intellij.GoFileType; import com.intellij.openapi.fileTypes.FileTypeConsumer; import com.intellij.openapi.fileTypes.FileTypeFactory; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoIconProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/GoIconProvider.java index a10d12517e..260f19388e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoIconProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoIconProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; -import com.goide.psi.GoFile; -import com.goide.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; import com.intellij.ide.IconProvider; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.util.Iconable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoIcons.java b/src/main/java/com/notzippy/intellij/go/intellij/GoIcons.java index a9395857ab..63e8e08ac4 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoIcons.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoIcons.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; import com.intellij.icons.AllIcons; import com.intellij.openapi.util.IconLoader; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoIndexPatternBuilder.java b/src/main/java/com/notzippy/intellij/go/intellij/GoIndexPatternBuilder.java index 89f76357d3..12e9221187 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoIndexPatternBuilder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoIndexPatternBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; -import com.goide.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFile; import com.intellij.lexer.Lexer; import com.intellij.psi.PsiFile; import com.intellij.psi.impl.search.IndexPatternBuilder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoLanguage.java b/src/main/java/com/notzippy/intellij/go/intellij/GoLanguage.java index 5bbc714c26..83d707ce8a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoLanguage.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoLanguage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; import com.intellij.lang.Language; import com.intellij.openapi.fileTypes.LanguageFileType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoModuleBuilder.java b/src/main/java/com/notzippy/intellij/go/intellij/GoModuleBuilder.java index 8803131a84..e5dda8381c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoModuleBuilder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoModuleBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; -import com.goide.sdk.GoSdkType; +import com.notzippy.intellij.go.intellij.sdk.GoSdkType; import com.intellij.compiler.CompilerWorkspaceConfiguration; import com.intellij.ide.util.projectWizard.JavaModuleBuilder; import com.intellij.ide.util.projectWizard.ModuleBuilderListener; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoModuleType.java b/src/main/java/com/notzippy/intellij/go/intellij/GoModuleType.java index 628bbfe501..fb7c93de3c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoModuleType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoModuleType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; -import com.goide.sdk.GoSdkType; +import com.notzippy.intellij.go.intellij.sdk.GoSdkType; import com.intellij.ide.util.projectWizard.ModuleWizardStep; import com.intellij.ide.util.projectWizard.ProjectJdkForModuleStep; import com.intellij.ide.util.projectWizard.WizardContext; @@ -56,12 +56,6 @@ public String getDescription() { return "Go modules are used for developing Go applications."; } - @Nullable - @Override - public Icon getIcon() { - return GoIcons.MODULE_ICON; - } - @Nullable @Override public Icon getNodeIcon(boolean isOpened) { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoNamesValidator.java b/src/main/java/com/notzippy/intellij/go/intellij/GoNamesValidator.java index 12b7595495..bc54507665 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoNamesValidator.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoNamesValidator.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; -import com.goide.lexer.GoLexer; +import com.notzippy.intellij.go.lexer.GoLexer; import com.intellij.lang.refactoring.NamesValidator; import com.intellij.openapi.project.Project; import com.intellij.psi.tree.IElementType; +import com.notzippy.intellij.go.parser.GoTypes; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoParserDefinition.java b/src/main/java/com/notzippy/intellij/go/intellij/GoParserDefinition.java index f8465598d0..05020633c3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoParserDefinition.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoParserDefinition.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; -import com.goide.lexer.GoLexer; -import com.goide.parser.GoParser; -import com.goide.psi.GoFile; -import com.goide.psi.GoTokenType; +import com.notzippy.intellij.go.lexer.GoLexer; +import com.notzippy.intellij.go.parser.GoParser; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoTokenType; import com.intellij.lang.ASTNode; import com.intellij.lang.ParserDefinition; import com.intellij.lang.PsiParser; @@ -33,7 +33,7 @@ import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; -import static com.goide.GoTypes.*; +import static com.notzippy.intellij.go.parser.GoTypes.*; public class GoParserDefinition implements ParserDefinition { public static final IElementType LINE_COMMENT = new GoTokenType("GO_LINE_COMMENT"); diff --git a/src/main/java/com/notzippy/intellij/go/intellij/GoProjectGenerator.java b/src/main/java/com/notzippy/intellij/go/intellij/GoProjectGenerator.java index bbeaeffb28..3df703c37a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/GoProjectGenerator.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/GoProjectGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go.intellij; import com.intellij.facet.ui.ValidationResult; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/UpdateComponent.java b/src/main/java/com/notzippy/intellij/go/intellij/UpdateComponent.java deleted file mode 100644 index 6025d867e1..0000000000 --- a/src/main/java/com/notzippy/intellij/go/intellij/UpdateComponent.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.goide; - -import com.intellij.ide.plugins.IdeaPluginDescriptor; -import com.intellij.ide.util.PropertiesComponent; -import com.intellij.openapi.Disposable; -import com.intellij.openapi.application.ApplicationInfo; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.PermanentInstallationID; -import com.intellij.openapi.components.ApplicationComponent; -import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.editor.Document; -import com.intellij.openapi.editor.EditorFactory; -import com.intellij.openapi.editor.event.EditorFactoryAdapter; -import com.intellij.openapi.editor.event.EditorFactoryEvent; -import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.util.JDOMUtil; -import com.intellij.openapi.util.SystemInfo; -import com.intellij.openapi.vfs.CharsetToolkit; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.io.HttpRequests; -import org.jdom.JDOMException; -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; -import java.net.URLEncoder; -import java.net.UnknownHostException; -import java.util.concurrent.TimeUnit; - -import static com.goide.util.GoUtil.getPlugin; - -public class UpdateComponent implements ApplicationComponent, Disposable { - private static final Logger LOG = Logger.getInstance(UpdateComponent.class); - private static final String KEY = "go.last.update.timestamp"; - private final EditorFactoryAdapter myListener = new EditorFactoryAdapter() { - @Override - public void editorCreated(@NotNull EditorFactoryEvent event) { - Document document = event.getEditor().getDocument(); - VirtualFile file = FileDocumentManager.getInstance().getFile(document); - if (file != null && file.getFileType() == GoFileType.INSTANCE) { - checkForUpdates(); - } - } - }; - - @Override - public void initComponent() { - if (!ApplicationManager.getApplication().isUnitTestMode()) { - EditorFactory.getInstance().addEditorFactoryListener(myListener, this); - } - } - - private static void checkForUpdates() { - PropertiesComponent propertiesComponent = PropertiesComponent.getInstance(); - long lastUpdate = propertiesComponent.getOrInitLong(KEY, 0); - if (lastUpdate == 0 || System.currentTimeMillis() - lastUpdate > TimeUnit.DAYS.toMillis(1)) { - ApplicationManager.getApplication().executeOnPooledThread(() -> { - try { - String buildNumber = ApplicationInfo.getInstance().getBuild().asString(); - IdeaPluginDescriptor plugin = getPlugin(); - String pluginVersion = plugin.getVersion(); - String pluginId = plugin.getPluginId().getIdString(); - String os = URLEncoder.encode(SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION, CharsetToolkit.UTF8); - String uid = PermanentInstallationID.get(); - String url = - "https://plugins.jetbrains.com/plugins/list" + - "?pluginId=" + pluginId + - "&build=" + buildNumber + - "&pluginVersion=" + pluginVersion + - "&os=" + os + - "&uuid=" + uid; - PropertiesComponent.getInstance().setValue(KEY, String.valueOf(System.currentTimeMillis())); - HttpRequests.request(url).connect( - request -> { - try { - JDOMUtil.load(request.getReader()); - LOG.info((request.isSuccessful() ? "Successful" : "Unsuccessful") + " update: " + url); - } - catch (JDOMException e) { - LOG.warn(e); - } - return null; - } - ); - } - catch (UnknownHostException ignored) { - } - catch (IOException e) { - LOG.warn(e); - } - }); - } - } - - @Override - public void disposeComponent() { - } - - @NotNull - @Override - public String getComponentName() { - return getClass().getName(); - } - - @Override - public void dispose() { - disposeComponent(); - } -} \ No newline at end of file diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoCreateFileAction.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoCreateFileAction.java index 69a9a2b385..bc666d0a16 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoCreateFileAction.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoCreateFileAction.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.actions.file; +package com.notzippy.intellij.go.intellij.actions.file; -import com.goide.GoIcons; -import com.goide.psi.GoFile; -import com.goide.psi.GoPackageClause; +import com.notzippy.intellij.go.intellij.GoIcons; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoPackageClause; import com.intellij.ide.actions.CreateFileFromTemplateAction; import com.intellij.ide.actions.CreateFileFromTemplateDialog; import com.intellij.openapi.editor.Editor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoCreateFromTemplateHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoCreateFromTemplateHandler.java index e1d0995614..9a2b7929b6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoCreateFromTemplateHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoCreateFromTemplateHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.actions.file; +package com.notzippy.intellij.go.intellij.actions.file; -import com.goide.GoConstants; -import com.goide.GoFileType; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoFileType; import com.intellij.ide.fileTemplates.DefaultCreateFromTemplateHandler; import com.intellij.ide.fileTemplates.FileTemplate; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoTemplatePropertiesProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoTemplatePropertiesProvider.java index 17ba4a02e9..03087db549 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoTemplatePropertiesProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/file/GoTemplatePropertiesProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.actions.file; +package com.notzippy.intellij.go.intellij.actions.file; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.ide.fileTemplates.DefaultTemplatePropertiesProvider; import com.intellij.ide.fileTemplates.FileTemplate; import com.intellij.psi.PsiDirectory; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoDownloadableFileAction.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoDownloadableFileAction.java index 1609352720..48c377c1f6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoDownloadableFileAction.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoDownloadableFileAction.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.actions.tool; +package com.notzippy.intellij.go.intellij.actions.tool; -import com.goide.GoConstants; -import com.goide.codeInsight.imports.GoGetPackageFix; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.codeInsight.imports.GoGetPackageFix; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.execution.ExecutionException; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoExternalToolsAction.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoExternalToolsAction.java index 63dde015cf..50c43f193c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoExternalToolsAction.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoExternalToolsAction.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.actions.tool; +package com.notzippy.intellij.go.intellij.actions.tool; -import com.goide.GoConstants; -import com.goide.GoFileType; -import com.goide.sdk.GoSdkService; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.execution.ExecutionException; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtCheckinFactory.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtCheckinFactory.java index d3598385e2..771674ee52 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtCheckinFactory.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtCheckinFactory.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.actions.tool; +package com.notzippy.intellij.go.intellij.actions.tool; -import com.goide.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFile; import com.intellij.CommonBundle; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.fileEditor.FileDocumentManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtFileAction.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtFileAction.java index 1784690606..e54f381582 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtFileAction.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtFileAction.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.actions.tool; +package com.notzippy.intellij.go.intellij.actions.tool; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtProjectAction.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtProjectAction.java index 6e6d3f4aaf..9527316f9f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtProjectAction.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoFmtProjectAction.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.actions.tool; +package com.notzippy.intellij.go.intellij.actions.tool; -import com.goide.sdk.GoSdkService; -import com.goide.sdk.GoSdkUtil; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoImportsFileAction.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoImportsFileAction.java index 605f5e1f1b..771708c0b3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoImportsFileAction.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoImportsFileAction.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.actions.tool; +package com.notzippy.intellij.go.intellij.actions.tool; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoTypeFileAction.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoTypeFileAction.java index 5d9346af78..6cc26bb931 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoTypeFileAction.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoTypeFileAction.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.actions.tool; +package com.notzippy.intellij.go.intellij.actions.tool; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoVetFileAction.java b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoVetFileAction.java index b1e8c67abf..89873ecf04 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoVetFileAction.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/actions/tool/GoVetFileAction.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.actions.tool; +package com.notzippy.intellij.go.intellij.actions.tool; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineExtension.java b/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineExtension.java index 6d4ff5034b..53c6c4bb79 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineExtension.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineExtension.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package com.goide.appengine; - -import com.goide.sdk.GoSdkService; -import com.intellij.appengine.AppEngineExtension; -import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleUtilCore; -import com.intellij.psi.PsiElement; -import org.jetbrains.annotations.Nullable; - -public class GoAppEngineExtension extends AppEngineExtension { - @Override - public boolean isAppEngineEnabled(@Nullable PsiElement context) { - if (context != null) { - // it's important to ask module on file, otherwise module won't be found for elements in libraries files [zolotov] - Module module = ModuleUtilCore.findModuleForPsiElement(context.getContainingFile()); - if (GoSdkService.getInstance(context.getProject()).isAppEngineSdk(module)) { - return true; - } - } - return false; - } -} +package com.notzippy.intellij.go.intellij.appengine; +// TODO figure out +//import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +//import com.intellij.appengine.AppEngineExtension; +//import com.intellij.openapi.module.Module; +//import com.intellij.openapi.module.ModuleUtilCore; +//import com.intellij.psi.PsiElement; +//import org.jetbrains.annotations.Nullable; +// +//public class GoAppEngineExtension extends AppEngineExtension { +// @Override +// public boolean isAppEngineEnabled(@Nullable PsiElement context) { +// if (context != null) { +// // it's important to ask module on file, otherwise module won't be found for elements in libraries files [zolotov] +// Module module = ModuleUtilCore.findModuleForPsiElement(context.getContainingFile()); +// if (GoSdkService.getInstance(context.getProject()).isAppEngineSdk(module)) { +// return true; +// } +// } +// return false; +// } +//} diff --git a/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineIcons.java b/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineIcons.java index c1ba6fc8d2..02cfab08a2 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineIcons.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineIcons.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.appengine; - -import com.goide.GoIcons; -import com.intellij.appengine.GoogleAppEngineIcons; -import com.intellij.ui.LayeredIcon; - -import javax.swing.*; - -public interface GoAppEngineIcons { - Icon ICON = new LayeredIcon(GoIcons.ICON, GoogleAppEngineIcons.AppEngineMark); -} +package com.notzippy.intellij.go.intellij.appengine; +// TODO FIgure out +//import com.notzippy.intellij.go.intellij.GoIcons; +//import com.intellij.appengine.GoogleAppEngineIcons; +//import com.intellij.ui.LayeredIcon; +// +//import javax.swing.*; +// +//public interface GoAppEngineIcons { +// Icon ICON = new LayeredIcon(GoIcons.ICON, GoogleAppEngineIcons.AppEngineMark); +//} diff --git a/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineLibraryPresentationProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineLibraryPresentationProvider.java index 8db5ae5c9a..76f0200c2d 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineLibraryPresentationProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/appengine/GoAppEngineLibraryPresentationProvider.java @@ -14,41 +14,43 @@ * limitations under the License. */ -package com.goide.appengine; +package com.notzippy.intellij.go.intellij.appengine; -import com.goide.sdk.GoSdkService; -import com.goide.sdk.GoSmallIDEsSdkService; -import com.intellij.openapi.roots.libraries.DummyLibraryProperties; -import com.intellij.openapi.roots.libraries.LibraryKind; -import com.intellij.openapi.roots.libraries.LibraryPresentationProvider; -import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +// TODO Figure out -import javax.swing.*; -import java.util.List; - -public class GoAppEngineLibraryPresentationProvider extends LibraryPresentationProvider { - private static final LibraryKind KIND = LibraryKind.create("go_gae"); - - public GoAppEngineLibraryPresentationProvider() { - super(KIND); - } - - @Nullable - @Override - public Icon getIcon() { - return GoAppEngineIcons.ICON; - } - - @Nullable - @Override - public DummyLibraryProperties detect(@NotNull List classesRoots) { - for (VirtualFile root : classesRoots) { - if (GoSmallIDEsSdkService.isGoSdkLibRoot(root) && GoSdkService.isAppEngineSdkPath(GoSdkService.libraryRootToSdkPath(root))) { - return DummyLibraryProperties.INSTANCE; - } - } - return null; - } -} +//import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +//import com.notzippy.intellij.go.intellij.sdk.GoSmallIDEsSdkService; +//import com.intellij.openapi.roots.libraries.DummyLibraryProperties; +//import com.intellij.openapi.roots.libraries.LibraryKind; +//import com.intellij.openapi.roots.libraries.LibraryPresentationProvider; +//import com.intellij.openapi.vfs.VirtualFile; +//import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.Nullable; +// +//import javax.swing.*; +//import java.util.List; +// +//public class GoAppEngineLibraryPresentationProvider extends LibraryPresentationProvider { +// private static final LibraryKind KIND = LibraryKind.create("go_gae"); +// +// public GoAppEngineLibraryPresentationProvider() { +// super(KIND); +// } +// +// @Nullable +// @Override +// public Icon getIcon() { +// return GoAppEngineIcons.ICON; +// } +// +// @Nullable +// @Override +// public DummyLibraryProperties detect(@NotNull List classesRoots) { +// for (VirtualFile root : classesRoots) { +// if (GoSmallIDEsSdkService.isGoSdkLibRoot(root) && GoSdkService.isAppEngineSdkPath(GoSdkService.libraryRootToSdkPath(root))) { +// return DummyLibraryProperties.INSTANCE; +// } +// } +// return null; +// } +//} diff --git a/src/main/java/com/notzippy/intellij/go/intellij/appengine/YamlFilesModificationTracker.java b/src/main/java/com/notzippy/intellij/go/intellij/appengine/YamlFilesModificationTracker.java index 983aa3878b..2334e09af0 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/appengine/YamlFilesModificationTracker.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/appengine/YamlFilesModificationTracker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.appengine; +package com.notzippy.intellij.go.intellij.appengine; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfiguration.java b/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfiguration.java index f4440d2d4e..0a022a706e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfiguration.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfiguration.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.appengine.run; +package com.notzippy.intellij.go.intellij.appengine.run; -import com.goide.runconfig.GoModuleBasedConfiguration; -import com.goide.runconfig.GoRunConfigurationBase; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.runconfig.GoModuleBasedConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationBase; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.execution.configurations.*; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfigurationEditor.java b/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfigurationEditor.java index 4d30f41aec..cc4d8c0877 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfigurationEditor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfigurationEditor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.appengine.run; +package com.notzippy.intellij.go.intellij.appengine.run; -import com.goide.appengine.YamlFilesModificationTracker; -import com.goide.runconfig.GoRunUtil; -import com.goide.runconfig.ui.GoCommonSettingsPanel; +import com.notzippy.intellij.go.intellij.appengine.YamlFilesModificationTracker; +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; +import com.notzippy.intellij.go.intellij.runconfig.ui.GoCommonSettingsPanel; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfigurationType.java b/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfigurationType.java index 220092ca44..9ebbdd3b44 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfigurationType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunConfigurationType.java @@ -14,31 +14,32 @@ * limitations under the License. */ -package com.goide.appengine.run; +package com.notzippy.intellij.go.intellij.appengine.run; -import com.goide.appengine.GoAppEngineIcons; -import com.goide.runconfig.GoConfigurationFactoryBase; -import com.intellij.execution.configurations.ConfigurationTypeBase; -import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.openapi.extensions.Extensions; -import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.NotNull; - -public class GoAppEngineRunConfigurationType extends ConfigurationTypeBase { - - public GoAppEngineRunConfigurationType() { - super("GoAppEngineRunConfiguration", "Go App Engine", "Go app engine web server runner", GoAppEngineIcons.ICON); - addFactory(new GoConfigurationFactoryBase(this) { - @Override - @NotNull - public RunConfiguration createTemplateConfiguration(@NotNull Project project) { - return new GoAppEngineRunConfiguration(project, "Go App Engine", getInstance()); - } - }); - } - - @NotNull - public static GoAppEngineRunConfigurationType getInstance() { - return Extensions.findExtension(CONFIGURATION_TYPE_EP, GoAppEngineRunConfigurationType.class); - } -} \ No newline at end of file +// TODO Figure out +//import com.notzippy.intellij.go.intellij.appengine.GoAppEngineIcons; +//import com.notzippy.intellij.go.intellij.runconfig.GoConfigurationFactoryBase; +//import com.intellij.execution.configurations.ConfigurationTypeBase; +//import com.intellij.execution.configurations.RunConfiguration; +//import com.intellij.openapi.extensions.Extensions; +//import com.intellij.openapi.project.Project; +//import org.jetbrains.annotations.NotNull; +// +//public class GoAppEngineRunConfigurationType extends ConfigurationTypeBase { +// +// public GoAppEngineRunConfigurationType() { +// super("GoAppEngineRunConfiguration", "Go App Engine", "Go app engine web server runner", GoAppEngineIcons.ICON); +// addFactory(new GoConfigurationFactoryBase(this) { +// @Override +// @NotNull +// public RunConfiguration createTemplateConfiguration(@NotNull Project project) { +// return new GoAppEngineRunConfiguration(project, "Go App Engine", getInstance()); +// } +// }); +// } +// +// @NotNull +// public static GoAppEngineRunConfigurationType getInstance() { +// return Extensions.findExtension(CONFIGURATION_TYPE_EP, GoAppEngineRunConfigurationType.class); +// } +//} diff --git a/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunningState.java b/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunningState.java index 5a4e674b96..231b965934 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunningState.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/appengine/run/GoAppEngineRunningState.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.appengine.run; +package com.notzippy.intellij.go.intellij.appengine.run; -import com.goide.runconfig.GoRunningState; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.runconfig.GoRunningState; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.execution.ExecutionException; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/GoExpressionTypeProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/GoExpressionTypeProvider.java index a880295e38..435cb673da 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/GoExpressionTypeProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/GoExpressionTypeProvider.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.codeInsight; +package com.notzippy.intellij.go.intellij.codeInsight; -import com.goide.psi.GoTopLevelDeclaration; -import com.goide.psi.GoType; -import com.goide.psi.GoTypeOwner; +import com.notzippy.intellij.go.grammar.psi.GoTopLevelDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoType; +import com.notzippy.intellij.go.grammar.psi.GoTypeOwner; import com.intellij.lang.ExpressionTypeProvider; import com.intellij.openapi.util.Conditions; import com.intellij.openapi.util.text.StringUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoAutoImportConfigurable.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoAutoImportConfigurable.java index 2ddf570815..53dc6c3ac6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoAutoImportConfigurable.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoAutoImportConfigurable.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.codeInsight.imports; +package com.notzippy.intellij.go.intellij.codeInsight.imports; -import com.goide.project.GoExcludedPathsSettings; +import com.notzippy.intellij.go.intellij.project.GoExcludedPathsSettings; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoCodeInsightSettings.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoCodeInsightSettings.java index 6faf71f76a..2eefbfe86c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoCodeInsightSettings.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoCodeInsightSettings.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.goide.codeInsight.imports; +package com.notzippy.intellij.go.intellij.codeInsight.imports; -import com.goide.GoConstants; +import com.notzippy.intellij.go.intellij.GoConstants; import com.intellij.openapi.components.*; import com.intellij.util.xmlb.XmlSerializerUtil; import org.jetbrains.annotations.Nullable; @State( name = GoConstants.GO, - storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/editor.codeinsight.xml") + storages = @Storage(file = StoragePathMacros.WORKSPACE_FILE + "/editor.codeinsight.xml") ) public class GoCodeInsightSettings implements PersistentStateComponent { private boolean myShowImportPopup = true; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoExcludePathLookupActionProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoExcludePathLookupActionProvider.java index 5b301fd8da..7c8b6ba493 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoExcludePathLookupActionProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoExcludePathLookupActionProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.codeInsight.imports; +package com.notzippy.intellij.go.intellij.codeInsight.imports; -import com.goide.project.GoExcludedPathsSettings; -import com.goide.psi.GoFile; +import com.notzippy.intellij.go.intellij.project.GoExcludedPathsSettings; +import com.notzippy.intellij.go.grammar.psi.GoFile; import com.intellij.codeInsight.lookup.Lookup; import com.intellij.codeInsight.lookup.LookupActionProvider; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoGetPackageFix.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoGetPackageFix.java index a9c8ab7438..ae46f99c89 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoGetPackageFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoGetPackageFix.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.codeInsight.imports; +package com.notzippy.intellij.go.intellij.codeInsight.imports; -import com.goide.sdk.GoSdkService; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportOptimizer.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportOptimizer.java index 4b59489c58..0bb8ec263b 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportOptimizer.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportOptimizer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.codeInsight.imports; +package com.notzippy.intellij.go.intellij.codeInsight.imports; -import com.goide.GoTypes; -import com.goide.psi.*; -import com.goide.psi.impl.GoReferenceBase; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoReferenceBase; import com.intellij.lang.ImportOptimizer; import com.intellij.openapi.editor.Document; import com.intellij.openapi.progress.ProgressManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportPackageQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportPackageQuickFix.java index dc7fdb48a8..1ee5fc6560 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportPackageQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportPackageQuickFix.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.goide.codeInsight.imports; +package com.notzippy.intellij.go.intellij.codeInsight.imports; -import com.goide.GoIcons; -import com.goide.completion.GoCompletionUtil; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.GoFile; -import com.goide.psi.GoReferenceExpression; -import com.goide.psi.GoTypeReferenceExpression; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoReference; -import com.goide.psi.impl.GoTypeReference; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.stubs.index.GoPackagesIndex; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.GoIcons; +import com.notzippy.intellij.go.intellij.completion.GoCompletionUtil; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.GoTypeReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoReference; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeReference; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.stubs.index.GoPackagesIndex; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.daemon.impl.DaemonListeners; import com.intellij.codeInsight.daemon.impl.ShowAutoImportPass; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoBracesUnwrapper.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoBracesUnwrapper.java index 491f2ac2e7..babf719b16 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoBracesUnwrapper.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoBracesUnwrapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; -import com.goide.psi.GoStatement; -import com.goide.psi.impl.GoStatementImpl; +import com.notzippy.intellij.go.grammar.psi.GoStatement; +import com.notzippy.intellij.go.grammar.psi.impl.GoStatementImpl; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseRemover.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseRemover.java index 6f118018c8..cc62ac4386 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseRemover.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseRemover.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapper.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapper.java index d5082e0ad4..d09b5c0cd6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapper.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; -import com.goide.psi.GoElseStatement; -import com.goide.psi.GoIfStatement; +import com.notzippy.intellij.go.grammar.psi.GoElseStatement; +import com.notzippy.intellij.go.grammar.psi.GoIfStatement; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapperBase.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapperBase.java index 546e03c960..d310ab6a33 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapperBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapperBase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; -import com.goide.psi.GoElseStatement; -import com.goide.psi.GoIfStatement; +import com.notzippy.intellij.go.grammar.psi.GoElseStatement; +import com.notzippy.intellij.go.grammar.psi.GoIfStatement; import com.intellij.psi.PsiElement; import java.util.Set; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoForUnwrapper.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoForUnwrapper.java index 9384743c07..ce833312c6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoForUnwrapper.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoForUnwrapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; -import com.goide.psi.GoForClause; -import com.goide.psi.GoForStatement; +import com.notzippy.intellij.go.grammar.psi.GoForClause; +import com.notzippy.intellij.go.grammar.psi.GoForStatement; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoFunctionArgumentUnwrapper.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoFunctionArgumentUnwrapper.java index d9f51c5612..f8b37e1887 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoFunctionArgumentUnwrapper.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoFunctionArgumentUnwrapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; -import com.goide.psi.GoArgumentList; -import com.goide.psi.GoCallExpr; -import com.goide.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.GoArgumentList; +import com.notzippy.intellij.go.grammar.psi.GoCallExpr; +import com.notzippy.intellij.go.grammar.psi.GoExpression; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ObjectUtils; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoIfUnwrapper.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoIfUnwrapper.java index c886ff605a..e1b58f5a4e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoIfUnwrapper.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoIfUnwrapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; -import com.goide.psi.GoElseStatement; -import com.goide.psi.GoIfStatement; +import com.notzippy.intellij.go.grammar.psi.GoElseStatement; +import com.notzippy.intellij.go.grammar.psi.GoIfStatement; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapDescriptor.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapDescriptor.java index e79dabcfc8..ed206aff84 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapDescriptor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; import com.intellij.codeInsight.unwrap.UnwrapDescriptorBase; import com.intellij.codeInsight.unwrap.Unwrapper; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapper.java b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapper.java index ee3cd53052..484e864e95 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapper.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; -import com.goide.psi.GoBlock; -import com.goide.psi.GoStatement; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoBlock; +import com.notzippy.intellij.go.grammar.psi.GoStatement; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.codeInsight.unwrap.AbstractUnwrapper; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiWhiteSpace; @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; public abstract class GoUnwrapper extends AbstractUnwrapper { - protected GoUnwrapper(String description) { + public GoUnwrapper(String description) { super(description); } @@ -36,7 +36,7 @@ protected Context createContext() { return new Context(); } - protected static class Context extends AbstractUnwrapper.AbstractContext { + protected static class Context extends AbstractContext { public void extractNewLine(PsiElement from) { PsiElement newLine = GoElementFactory.createNewLine(from.getProject()); if (myIsEffective) { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/AddBracketsInsertHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/AddBracketsInsertHandler.java index 8f1c10ffa7..01d40b34ed 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/AddBracketsInsertHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/AddBracketsInsertHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; import com.intellij.codeInsight.completion.InsertionContext; import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/BracesInsertHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/BracesInsertHandler.java index 1d8ba26dc4..57033c0692 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/BracesInsertHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/BracesInsertHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; import com.intellij.codeInsight.completion.InsertHandler; import com.intellij.codeInsight.completion.InsertionContext; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/CancellableCollectProcessor.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/CancellableCollectProcessor.java index ede0a64f26..944c5852f7 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/CancellableCollectProcessor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/CancellableCollectProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; import com.intellij.openapi.progress.ProgressManager; import com.intellij.util.CommonProcessors; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoAutoImportCompletionContributor.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoAutoImportCompletionContributor.java index 4a8d39cd0c..570aa46648 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoAutoImportCompletionContributor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoAutoImportCompletionContributor.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.goide.completion; - -import com.goide.project.GoVendoringUtil; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoTypeReference; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.stubs.index.GoIdFilter; -import com.goide.util.GoUtil; +package com.notzippy.intellij.go.intellij.completion; + +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeReference; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.stubs.index.GoIdFilter; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.codeInsight.completion.*; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; @@ -46,9 +46,9 @@ import java.util.*; -import static com.goide.completion.GoCompletionUtil.createPrefixMatcher; -import static com.goide.psi.impl.GoPsiImplUtil.prevDot; -import static com.goide.stubs.index.GoAllPublicNamesIndex.ALL_PUBLIC_NAMES; +import static com.notzippy.intellij.go.intellij.completion.GoCompletionUtil.createPrefixMatcher; +import static com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil.prevDot; +import static com.notzippy.intellij.go.stubs.index.GoAllPublicNamesIndex.ALL_PUBLIC_NAMES; import static com.intellij.patterns.PlatformPatterns.psiElement; public class GoAutoImportCompletionContributor extends CompletionContributor { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoAutoImportInsertHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoAutoImportInsertHandler.java index 8a280fbfb8..be182fd54f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoAutoImportInsertHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoAutoImportInsertHandler.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.codeInsight.imports.GoImportPackageQuickFix; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoNamedElement; -import com.goide.psi.GoTypeSpec; +import com.notzippy.intellij.go.intellij.codeInsight.imports.GoImportPackageQuickFix; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; import com.intellij.codeInsight.completion.InsertHandler; import com.intellij.codeInsight.completion.InsertionContext; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCharFilter.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCharFilter.java index 97fb4c2a55..2d2f2b787b 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCharFilter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCharFilter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.psi.GoImportString; +import com.notzippy.intellij.go.grammar.psi.GoImportString; import com.intellij.codeInsight.lookup.CharFilter; import com.intellij.codeInsight.lookup.Lookup; import com.intellij.psi.util.PsiTreeUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionConfidence.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionConfidence.java index 5a56d23e02..8d60a06135 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionConfidence.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionConfidence.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.codeInsight.completion.CompletionConfidence; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionContributor.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionContributor.java index 9838757add..3173f67c03 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionContributor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionContributor.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.GoConstants; -import com.goide.GoParserDefinition; -import com.goide.GoTypes; -import com.goide.psi.*; -import com.goide.psi.impl.GoCachedReference; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoParserDefinition; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoCachedReference; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; import com.intellij.codeInsight.completion.CompletionContributor; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionResultSet; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionUtil.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionUtil.java index 3ecc5887b2..67b1385afe 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionUtil.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoCompletionUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.GoIcons; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.sdk.GoSdkUtil; -import com.goide.stubs.GoFieldDefinitionStub; +import com.notzippy.intellij.go.intellij.GoIcons; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; +import com.notzippy.intellij.go.stubs.GoFieldDefinitionStub; import com.intellij.codeInsight.AutoPopupController; import com.intellij.codeInsight.completion.InsertHandler; import com.intellij.codeInsight.completion.InsertionContext; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoImportPathsCompletionProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoImportPathsCompletionProvider.java index d7e2224a82..4ded4b38a7 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoImportPathsCompletionProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoImportPathsCompletionProvider.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.GoFileType; -import com.goide.project.GoExcludedPathsSettings; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.GoFile; -import com.goide.psi.GoImportString; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.intellij.project.GoExcludedPathsSettings; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoImportString; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionProvider; import com.intellij.codeInsight.completion.CompletionResultSet; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoKeywordCompletionContributor.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoKeywordCompletionContributor.java index 548932ad24..40680ae68c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoKeywordCompletionContributor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoKeywordCompletionContributor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.GoTypes; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.template.GoLiveTemplateContextType; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.template.GoLiveTemplateContextType; import com.intellij.codeInsight.completion.*; import com.intellij.codeInsight.lookup.AutoCompletionPolicy; import com.intellij.codeInsight.lookup.LookupElement; @@ -35,9 +35,9 @@ import java.util.Collection; -import static com.goide.completion.GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY; -import static com.goide.completion.GoCompletionUtil.KEYWORD_PRIORITY; -import static com.goide.completion.GoKeywordCompletionProvider.EMPTY_INSERT_HANDLER; +import static com.notzippy.intellij.go.intellij.completion.GoCompletionUtil.CONTEXT_KEYWORD_PRIORITY; +import static com.notzippy.intellij.go.intellij.completion.GoCompletionUtil.KEYWORD_PRIORITY; +import static com.notzippy.intellij.go.intellij.completion.GoKeywordCompletionProvider.EMPTY_INSERT_HANDLER; import static com.intellij.patterns.PlatformPatterns.psiElement; import static com.intellij.patterns.PlatformPatterns.psiFile; import static com.intellij.patterns.StandardPatterns.*; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoKeywordCompletionProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoKeywordCompletionProvider.java index 326d3b30fc..051ca4820c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoKeywordCompletionProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoKeywordCompletionProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; import com.intellij.codeInsight.completion.*; import com.intellij.codeInsight.lookup.AutoCompletionPolicy; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoReferenceCompletionProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoReferenceCompletionProvider.java index 4d1601f3a5..90dd110a29 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoReferenceCompletionProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoReferenceCompletionProvider.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.*; -import com.goide.psi.impl.*; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.*; import com.intellij.codeInsight.completion.CompletionParameters; import com.intellij.codeInsight.completion.CompletionProvider; import com.intellij.codeInsight.completion.CompletionResultSet; @@ -36,7 +36,7 @@ import java.util.Set; -import static com.goide.completion.GoCompletionUtil.createPrefixMatcher; +import static com.notzippy.intellij.go.intellij.completion.GoCompletionUtil.createPrefixMatcher; public class GoReferenceCompletionProvider extends CompletionProvider { @Override diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoStructLiteralCompletion.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoStructLiteralCompletion.java index 6fd6b483f1..361fbc2a1e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoStructLiteralCompletion.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoStructLiteralCompletion.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.psi.PsiElement; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoTestFunctionCompletionProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoTestFunctionCompletionProvider.java index 2d66e5d1e4..9a39b8a0f4 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/GoTestFunctionCompletionProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/GoTestFunctionCompletionProvider.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.GoConstants; -import com.goide.psi.*; -import com.goide.psi.impl.GoElementFactory; -import com.goide.runconfig.testing.GoTestFunctionType; -import com.goide.runconfig.testing.frameworks.gotest.GotestGenerateAction; -import com.goide.sdk.GoPackageUtil; -import com.goide.stubs.index.GoFunctionIndex; -import com.goide.stubs.index.GoIdFilter; -import com.goide.stubs.index.GoMethodIndex; -import com.goide.stubs.types.GoMethodDeclarationStubElementType; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFunctionType; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GotestGenerateAction; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.stubs.index.GoFunctionIndex; +import com.notzippy.intellij.go.stubs.index.GoIdFilter; +import com.notzippy.intellij.go.stubs.index.GoMethodIndex; +import com.notzippy.intellij.go.stubs.types.GoMethodDeclarationStubElementType; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.codeInsight.completion.*; import com.intellij.codeInsight.completion.impl.CamelHumpMatcher; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/completion/SingleCharInsertHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/completion/SingleCharInsertHandler.java index dc83f22faf..770cbe9f1a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/completion/SingleCharInsertHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/completion/SingleCharInsertHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; import com.intellij.codeInsight.AutoPopupController; import com.intellij.codeInsight.completion.BasicInsertHandler; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoBuildTagsUI.form b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoBuildTagsUI.form index c1f5653283..537c1606f5 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoBuildTagsUI.form +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoBuildTagsUI.form @@ -1,5 +1,5 @@ -
    + diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoBuildTagsUI.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoBuildTagsUI.java index 06e9e67188..18cd9d0085 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoBuildTagsUI.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoBuildTagsUI.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.GoConstants; -import com.goide.project.GoBuildTargetSettings; -import com.goide.sdk.GoSdkService; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.project.GoBuildTargetSettings; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.ProjectTopics; import com.intellij.openapi.Disposable; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoConfigurableProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoConfigurableProvider.java index 0640aec3fe..a8ecdee6f3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoConfigurableProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoConfigurableProvider.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.GoConstants; -import com.goide.codeInsight.imports.GoAutoImportConfigurable; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.openapi.module.Module; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurableProvider; @@ -42,10 +41,9 @@ public Configurable createConfigurable() { Configurable projectSettingsConfigurable = new GoProjectSettingsConfigurable(myProject); Configurable librariesConfigurable = new GoLibrariesConfigurableProvider(myProject).createConfigurable(); Configurable sdkConfigurable = GoSdkService.getInstance(myProject).createSdkConfigurable(); - Configurable autoImportConfigurable = new GoAutoImportConfigurable(myProject, false); return sdkConfigurable != null - ? new GoCompositeConfigurable(sdkConfigurable, projectSettingsConfigurable, librariesConfigurable, autoImportConfigurable) - : new GoCompositeConfigurable(projectSettingsConfigurable, librariesConfigurable, autoImportConfigurable); + ? new GoCompositeConfigurable(sdkConfigurable, projectSettingsConfigurable, librariesConfigurable) + : new GoCompositeConfigurable(projectSettingsConfigurable, librariesConfigurable); } private static class GoCompositeConfigurable extends SearchableConfigurable.Parent.Abstract { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoLibrariesConfigurable.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoLibrariesConfigurable.java index 69efe8c83c..7212032591 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoLibrariesConfigurable.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoLibrariesConfigurable.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.project.GoApplicationLibrariesService; -import com.goide.project.GoLibrariesService; +import com.notzippy.intellij.go.intellij.project.GoApplicationLibrariesService; +import com.notzippy.intellij.go.intellij.project.GoLibrariesService; import com.intellij.openapi.fileChooser.FileChooserDialog; import com.intellij.openapi.fileChooser.FileChooserFactory; import com.intellij.openapi.options.Configurable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoLibrariesConfigurableProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoLibrariesConfigurableProvider.java index 607eb96e19..0714257d3e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoLibrariesConfigurableProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoLibrariesConfigurableProvider.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.project.GoApplicationLibrariesService; -import com.goide.project.GoModuleLibrariesService; -import com.goide.project.GoProjectLibrariesService; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.project.GoApplicationLibrariesService; +import com.notzippy.intellij.go.intellij.project.GoModuleLibrariesService; +import com.notzippy.intellij.go.intellij.project.GoProjectLibrariesService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleAwareConfigurable.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleAwareConfigurable.java index 26d64ed17f..ecf84374a3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleAwareConfigurable.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleAwareConfigurable.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.application.options.ModuleAwareProjectConfigurable; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleEditorsProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleEditorsProvider.java index 76b1307b0d..12888096be 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleEditorsProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleEditorsProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.GoModuleType; +import com.notzippy.intellij.go.intellij.GoModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleConfigurationEditor; import com.intellij.openapi.module.ModuleType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsConfigurable.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsConfigurable.java index 200444788d..a96b7cf7c7 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsConfigurable.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsConfigurable.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; import com.intellij.openapi.module.Module; import com.intellij.openapi.options.ConfigurableBase; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsUI.form b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsUI.form index 5d87fae545..409d9dd655 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsUI.form +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsUI.form @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsUI.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsUI.java index 0c2dcb0eb1..2b62697875 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsUI.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoModuleSettingsUI.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.project.GoBuildTargetSettings; -import com.goide.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.project.GoBuildTargetSettings; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; import com.intellij.openapi.Disposable; import com.intellij.openapi.module.Module; import com.intellij.openapi.options.ConfigurableUi; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoSdkConfigurable.form b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoSdkConfigurable.form index 8ba3ca938f..90c93b9b03 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoSdkConfigurable.form +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoSdkConfigurable.form @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoSdkConfigurable.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoSdkConfigurable.java index 7f26d0fe97..15b98c5524 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoSdkConfigurable.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoSdkConfigurable.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.sdk.GoSdkService; -import com.goide.sdk.GoSdkUtil; -import com.goide.sdk.GoSmallIDEsSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSmallIDEsSdkService; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoUIUtil.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoUIUtil.java index 8146bd9667..a6823ea989 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoUIUtil.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoUIUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; import com.intellij.ui.BrowserHyperlinkListener; import com.intellij.ui.ColorUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoVendoringUI.form b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoVendoringUI.form index 49a68257b2..8fd29a6178 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoVendoringUI.form +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoVendoringUI.form @@ -1,5 +1,5 @@ - + diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoVendoringUI.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoVendoringUI.java index ddabd09213..6c7c874ac9 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoVendoringUI.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/GoVendoringUI.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; -import com.goide.project.GoModuleSettings; -import com.goide.project.GoVendoringUtil; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.ProjectTopics; import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/configuration/ListenableHideableDecorator.java b/src/main/java/com/notzippy/intellij/go/intellij/configuration/ListenableHideableDecorator.java index 06e26fd24b..cdd0694e8e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/configuration/ListenableHideableDecorator.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/configuration/ListenableHideableDecorator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.configuration; +package com.notzippy.intellij.go.intellij.configuration; import com.intellij.ui.HideableDecorator; import com.intellij.util.containers.ContainerUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvCommandProcessor.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvCommandProcessor.java index fc651f234b..e719ad2f02 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvCommandProcessor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvCommandProcessor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.dlv; +package com.notzippy.intellij.go.intellij.dlv; -import com.goide.dlv.protocol.DlvRequest; -import com.goide.dlv.protocol.DlvResponse; +import com.notzippy.intellij.go.intellij.dlv.protocol.DlvRequest; +import com.notzippy.intellij.go.intellij.dlv.protocol.DlvResponse; import com.google.gson.GsonBuilder; import com.google.gson.stream.JsonReader; import com.intellij.openapi.util.text.StringUtil; @@ -59,7 +59,7 @@ public void call(@NotNull DlvResponse response, @NotNull RequestCallback vmResult) { +// return NettyKt.oioClientBootstrap().handler(new ChannelInitializer() { +// @Override +// protected void initChannel(@NotNull Channel channel) throws Exception { +// vmResult.setResult(new DlvVm(getDebugEventListener(), channel)); +// } +// }); +// } + @NotNull @Override - public Bootstrap createBootstrap(@NotNull InetSocketAddress address, @NotNull AsyncPromise vmResult) { - return NettyKt.oioClientBootstrap().handler(new ChannelInitializer() { - @Override - protected void initChannel(@NotNull Channel channel) throws Exception { - vmResult.setResult(new DlvVm(getDebugEventListener(), channel)); - } - }); + protected String connectedAddressToPresentation(@NotNull InetSocketAddress address, @NotNull Vm vm) { + return address.toString(); } + // TODO Fix @NotNull @Override - protected String connectedAddressToPresentation(@NotNull InetSocketAddress address, @NotNull Vm vm) { - return address.toString(); + public Bootstrap createBootstrap(@NotNull InetSocketAddress inetSocketAddress, @NotNull AsyncPromise asyncPromise) { + return null; } } \ No newline at end of file diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvStackFrame.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvStackFrame.java index 6fb02a94a9..7eb5429933 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvStackFrame.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvStackFrame.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.dlv; +package com.notzippy.intellij.go.intellij.dlv; -import com.goide.GoIcons; -import com.goide.dlv.protocol.DlvApi; -import com.goide.dlv.protocol.DlvRequest; -import com.goide.psi.*; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.GoIcons; +import com.notzippy.intellij.go.intellij.dlv.protocol.DlvApi; +import com.notzippy.intellij.go.intellij.dlv.protocol.DlvRequest; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.execution.configurations.ModuleBasedConfiguration; import com.intellij.execution.configurations.RunProfile; import com.intellij.icons.AllIcons; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvSuspendContext.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvSuspendContext.java index a05684fcd1..89d79fdd18 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvSuspendContext.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvSuspendContext.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.dlv; +package com.notzippy.intellij.go.intellij.dlv; -import com.goide.dlv.protocol.DlvApi; +import com.notzippy.intellij.go.intellij.dlv.protocol.DlvApi; import com.intellij.util.containers.ContainerUtil; import com.intellij.xdebugger.frame.XExecutionStack; import com.intellij.xdebugger.frame.XStackFrame; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvVm.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvVm.java index 025c595fff..7612d436f1 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvVm.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvVm.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.dlv; +package com.notzippy.intellij.go.intellij.dlv; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.vfs.CharsetToolkit; @@ -23,12 +23,13 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.json.JsonObjectDecoder; import org.jetbrains.annotations.NotNull; -import org.jetbrains.concurrency.Promise; +import org.jetbrains.concurrency.*; import org.jetbrains.debugger.*; import org.jetbrains.io.ChannelBufferToString; import org.jetbrains.io.SimpleChannelInboundHandlerAdapter; import org.jetbrains.jsonProtocol.Request; + import java.io.IOException; public class DlvVm extends VmBase { @@ -99,7 +100,7 @@ public SuspendContextManagerBase getSuspendContextManager() { @NotNull @Override public Promise continueVm(@NotNull StepAction stepAction, int stepCount) { - return Promise.DONE; + return Promises.resolvedPromise(); } @NotNull @@ -111,8 +112,9 @@ protected DebugEventListener getDebugListener() { @NotNull @Override protected Promise doSuspend() { - return Promise.DONE; + return Promises.resolvedPromise(); } }; } + } \ No newline at end of file diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvXValue.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvXValue.java index 8a6a757b57..86e4d43602 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvXValue.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/DlvXValue.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.dlv; - -import com.goide.dlv.protocol.DlvApi; -import com.goide.dlv.protocol.DlvRequest; -import com.goide.psi.GoNamedElement; -import com.goide.psi.GoTopLevelDeclaration; -import com.goide.psi.GoTypeSpec; -import com.goide.stubs.index.GoTypesIndex; +package com.notzippy.intellij.go.intellij.dlv; + +import com.notzippy.intellij.go.intellij.dlv.protocol.DlvApi; +import com.notzippy.intellij.go.intellij.dlv.protocol.DlvRequest; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoTopLevelDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; +import com.notzippy.intellij.go.stubs.index.GoTypesIndex; import com.intellij.icons.AllIcons; import com.intellij.lang.ASTNode; import com.intellij.openapi.application.ApplicationManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/JsonReaderEx.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/JsonReaderEx.java index d5650aeee7..fe0a235f35 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/JsonReaderEx.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/JsonReaderEx.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.dlv; +package com.notzippy.intellij.go.intellij.dlv; import com.google.gson.JsonParseException; import com.google.gson.stream.JsonReader; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/breakpoint/DlvBreakpointProperties.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/breakpoint/DlvBreakpointProperties.java index 659349d7e4..57bcd3d54c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/breakpoint/DlvBreakpointProperties.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/breakpoint/DlvBreakpointProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.dlv.breakpoint; +package com.notzippy.intellij.go.intellij.dlv.breakpoint; import com.intellij.xdebugger.breakpoints.XBreakpointProperties; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/breakpoint/DlvBreakpointType.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/breakpoint/DlvBreakpointType.java index 6da3c9b736..d1eeb7c04c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/breakpoint/DlvBreakpointType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/breakpoint/DlvBreakpointType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.dlv.breakpoint; +package com.notzippy.intellij.go.intellij.dlv.breakpoint; -import com.goide.GoFileType; -import com.goide.GoParserDefinition; -import com.goide.dlv.DlvDebugProcess; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.intellij.GoParserDefinition; +import com.notzippy.intellij.go.intellij.dlv.DlvDebugProcess; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvApi.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvApi.java index b05e34cdcc..bc5d35c457 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvApi.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvApi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.dlv.protocol; +package com.notzippy.intellij.go.intellij.dlv.protocol; import com.google.gson.annotations.SerializedName; import com.intellij.openapi.diagnostic.Logger; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvRequest.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvRequest.java index df7463dfad..32b25cbc0a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvRequest.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.dlv.protocol; +package com.notzippy.intellij.go.intellij.dlv.protocol; import com.google.gson.stream.JsonWriter; import org.jetbrains.annotations.NotNull; @@ -29,7 +29,7 @@ * Please add your requests as a subclasses, otherwise reflection won't work. * * @param type of callback - * @see com.goide.dlv.DlvCommandProcessor#getResultType(String) + * @see com.notzippy.intellij.go.intellij.dlv.DlvCommandProcessor#getResultType(String) */ public abstract class DlvRequest extends OutMessage implements Request { private static final String PARAMS = "params"; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvResponse.java b/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvResponse.java index fa7534de97..50bc9af4c6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvResponse.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/dlv/protocol/DlvResponse.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.dlv.protocol; +package com.notzippy.intellij.go.intellij.dlv.protocol; -import com.goide.dlv.JsonReaderEx; +import com.notzippy.intellij.go.intellij.dlv.JsonReaderEx; import com.google.gson.stream.JsonToken; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -51,7 +51,7 @@ interface ErrorInfo { } final class CommandResponseImpl implements DlvResponse { - @Nullable private DlvResponse.ErrorInfo _error; + @Nullable private ErrorInfo _error; private int _id = -1; @Nullable private JsonReaderEx _result; @@ -87,7 +87,7 @@ else if ("result".equals(name)) { @Nullable @Override - public DlvResponse.ErrorInfo error() { + public ErrorInfo error() { return _error; } @@ -103,7 +103,7 @@ public JsonReaderEx result() { } } - final class M5m implements DlvResponse.ErrorInfo { + final class M5m implements ErrorInfo { private static final int _code = -1; @NotNull private final List _data = Collections.emptyList(); @Nullable private final String _message; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoBraceMatcher.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoBraceMatcher.java index d805764673..8e39ef708d 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoBraceMatcher.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoBraceMatcher.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoParserDefinition; -import com.goide.GoTypes; +import com.notzippy.intellij.go.intellij.GoParserDefinition; +import com.notzippy.intellij.go.parser.GoTypes; import com.intellij.lang.BracePair; import com.intellij.lang.PairedBraceMatcher; import com.intellij.psi.PsiFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoFoldingBuilder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoFoldingBuilder.java index 3b42f73b70..94fbf3be14 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoFoldingBuilder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoFoldingBuilder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoParserDefinition; -import com.goide.GoTypes; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.GoParserDefinition; +import com.notzippy.intellij.go.parser.GoTypes; import com.intellij.codeInsight.folding.CodeFoldingSettings; import com.intellij.lang.ASTNode; import com.intellij.lang.folding.CustomFoldingBuilder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoImplementationTextSelectioner.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoImplementationTextSelectioner.java index 63985ca1c1..d4d5baedc2 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoImplementationTextSelectioner.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoImplementationTextSelectioner.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.psi.GoTopLevelDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoTopLevelDeclaration; import com.intellij.codeInsight.hint.ImplementationTextSelectioner; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoParameterInfoHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoParameterInfoHandler.java index 83bf7170a2..f34ffe8e01 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoParameterInfoHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoParameterInfoHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoTypes; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.parser.GoTypes; import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.lang.parameterInfo.*; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoQuoteHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoQuoteHandler.java index 36667e2433..3649192992 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoQuoteHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoQuoteHandler.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoTypes; +import com.notzippy.intellij.go.parser.GoTypes; import com.intellij.codeInsight.editorActions.JavaLikeQuoteHandler; import com.intellij.codeInsight.editorActions.SimpleTokenSetQuoteHandler; import com.intellij.openapi.editor.Editor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoStatementMover.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoStatementMover.java index 5234befaf2..d26c447330 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoStatementMover.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoStatementMover.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInsight.editorActions.moveUpDown.LineMover; import com.intellij.codeInsight.editorActions.moveUpDown.LineRange; import com.intellij.lang.ASTNode; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoTypeDeclarationProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoTypeDeclarationProvider.java index e556f6d157..76e2b2b1d2 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoTypeDeclarationProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoTypeDeclarationProvider.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.psi.GoNamedElement; -import com.goide.psi.GoType; -import com.goide.psi.GoTypeReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoType; +import com.notzippy.intellij.go.grammar.psi.GoTypeReferenceExpression; import com.intellij.codeInsight.navigation.actions.TypeDeclarationProvider; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoTypedHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoTypedHandler.java index f348cbd122..14ccdf0f86 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoTypedHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoTypedHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; import com.intellij.codeInsight.template.impl.editorActions.TypedActionHandlerBase; import com.intellij.openapi.actionSystem.DataContext; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoWordSelectioner.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoWordSelectioner.java index 45f8695101..b2b96311b3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/GoWordSelectioner.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/GoWordSelectioner.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInsight.editorActions.wordSelection.AbstractWordSelectioner; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.util.TextRange; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/marker/GoMethodSeparatorProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/marker/GoMethodSeparatorProvider.java index 59ad5f64c4..9dc9faf50c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/marker/GoMethodSeparatorProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/marker/GoMethodSeparatorProvider.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package com.goide.editor.marker; +package com.notzippy.intellij.go.intellij.editor.marker; -import com.goide.psi.GoFile; -import com.goide.psi.GoTopLevelDeclaration; +import com.intellij.codeInsight.daemon.LineMarkerProviderDescriptor; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoTopLevelDeclaration; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings; import com.intellij.codeInsight.daemon.LineMarkerInfo; import com.intellij.codeInsight.daemon.LineMarkerProvider; @@ -31,11 +32,39 @@ import java.util.Collection; import java.util.List; - -public class GoMethodSeparatorProvider implements LineMarkerProvider { +//public class GoMethodSeparatorProvider implements LineMarkerProvider { +// public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) { +// if (element instanceof GoTopLevelDeclaration && o.getParent() instanceof GoFile) { +// return LineMarkersPass.createMethodSeparatorLineMarker(findAnchorElement((GoTopLevelDeclaration)o), myColorsManager); +// } +// } +// @NotNull +// private static PsiElement findAnchorElement(@NotNull GoTopLevelDeclaration o) { +// PsiElement result = o; +// PsiElement p = o; +// while ((p = p.getPrevSibling()) != null) { +// if (p instanceof PsiComment) { +// result = p; +// } +// else if (p instanceof PsiWhiteSpace) { +// if (p.getText().contains("\n\n")) return result; +// } +// else { +// break; +// } +// } +// return result; +// } +// +//} +// https://github.com/17712484466/intellij-community/blob/master/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java +public class GoMethodSeparatorProvider implements LineMarkerProvider { private final DaemonCodeAnalyzerSettings myDaemonSettings; private final EditorColorsManager myColorsManager; + public GoMethodSeparatorProvider() { + this(null,null); + } public GoMethodSeparatorProvider(DaemonCodeAnalyzerSettings daemonSettings, EditorColorsManager colorsManager) { myDaemonSettings = daemonSettings; myColorsManager = colorsManager; @@ -44,7 +73,7 @@ public GoMethodSeparatorProvider(DaemonCodeAnalyzerSettings daemonSettings, Edit @Nullable @Override public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement o) { - if (myDaemonSettings.SHOW_METHOD_SEPARATORS && o instanceof GoTopLevelDeclaration && o.getParent() instanceof GoFile) { + if (myDaemonSettings!=null && myDaemonSettings.SHOW_METHOD_SEPARATORS && o instanceof GoTopLevelDeclaration && o.getParent() instanceof GoFile) { return LineMarkersPass.createMethodSeparatorLineMarker(findAnchorElement((GoTopLevelDeclaration)o), myColorsManager); } return null; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/smart/GoSmartEnterProcessor.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/smart/GoSmartEnterProcessor.java index e5122ae9aa..2d253305b3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/smart/GoSmartEnterProcessor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/smart/GoSmartEnterProcessor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.editor.smart; +package com.notzippy.intellij.go.intellij.editor.smart; -import com.goide.inspections.GoDeferGoInspection; -import com.goide.psi.*; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.intellij.inspections.GoDeferGoInspection; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.lang.SmartEnterProcessorWithFixers; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoBoolExpressionSurrounderBase.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoBoolExpressionSurrounderBase.java index c6a9613e73..5fcf235f10 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoBoolExpressionSurrounderBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoBoolExpressionSurrounderBase.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; -import com.goide.psi.GoExpression; -import com.goide.psi.GoIfStatement; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoTypeUtil; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.GoIfStatement; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeUtil; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoExpressionSurroundDescriptor.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoExpressionSurroundDescriptor.java index 138671fe97..1a8aeec361 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoExpressionSurroundDescriptor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoExpressionSurroundDescriptor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; -import com.goide.psi.GoExpression; -import com.goide.refactor.GoIntroduceVariableBase; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.intellij.refactor.GoIntroduceVariableBase; import com.intellij.featureStatistics.FeatureUsageTracker; -import com.intellij.internal.statistic.UsageTrigger; +// import com.intellij.internal.statistic.UsageTrigger; import com.intellij.lang.surroundWith.SurroundDescriptor; import com.intellij.lang.surroundWith.Surrounder; import com.intellij.psi.PsiElement; @@ -45,7 +45,7 @@ public Surrounder[] getSurrounders() { public PsiElement[] getElementsToSurround(PsiFile file, int startOffset, int endOffset) { GoExpression expr = GoIntroduceVariableBase.findExpressionInSelection(file, startOffset, endOffset); if (expr == null) return PsiElement.EMPTY_ARRAY; - UsageTrigger.trigger("go.surroundwith.expression"); + // TODO UsageTrigger.trigger("go.surroundwith.expression"); FeatureUsageTracker.getInstance().triggerFeatureUsed("codeassists.surroundwith.expression"); return new PsiElement[]{expr}; } diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoExpressionSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoExpressionSurrounder.java index bb2f136888..7017e5769c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoExpressionSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoExpressionSurrounder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; -import com.goide.psi.GoExpression; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.lang.surroundWith.Surrounder; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoStatementsSurroundDescriptor.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoStatementsSurroundDescriptor.java index c4b57af69a..4ed4f63775 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoStatementsSurroundDescriptor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoStatementsSurroundDescriptor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; -import com.goide.psi.GoFile; -import com.goide.psi.GoPsiTreeUtil; -import com.goide.psi.GoStatement; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoPsiTreeUtil; +import com.notzippy.intellij.go.grammar.psi.GoStatement; import com.intellij.lang.surroundWith.SurroundDescriptor; import com.intellij.lang.surroundWith.Surrounder; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoStatementsSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoStatementsSurrounder.java index 1de1175b46..12055e8528 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoStatementsSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoStatementsSurrounder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; -import com.goide.psi.GoBlock; -import com.goide.psi.GoIfStatement; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoBlock; +import com.notzippy.intellij.go.grammar.psi.GoIfStatement; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.lang.surroundWith.Surrounder; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithBlockSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithBlockSurrounder.java index 4b557e21a1..d1e851762e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithBlockSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithBlockSurrounder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; -import com.goide.psi.GoBlock; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoBlock; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithForSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithForSurrounder.java index 02759e4b0b..26f85cd249 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithForSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithForSurrounder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; -import com.goide.psi.GoForStatement; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoForStatement; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseExpressionSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseExpressionSurrounder.java index c1c6944caa..39e5459fa5 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseExpressionSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseExpressionSurrounder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseSurrounder.java index 0e5fb92264..2df76e5f40 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseSurrounder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfExpressionSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfExpressionSurrounder.java index c89e0b292f..cf1c8b1467 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfExpressionSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfExpressionSurrounder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfSurrounder.java index 8696dcf1b3..d12e63e48d 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfSurrounder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithNotExpressionSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithNotExpressionSurrounder.java index bbf150e015..8651c79a4f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithNotExpressionSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithNotExpressionSurrounder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithParenthesisSurrounder.java b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithParenthesisSurrounder.java index 6ad737e1e4..0aaf6b5e11 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithParenthesisSurrounder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithParenthesisSurrounder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/formatter/GoFormattingModelBuilder.java b/src/main/java/com/notzippy/intellij/go/intellij/formatter/GoFormattingModelBuilder.java index 146329a62d..a0ab3e0aec 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/formatter/GoFormattingModelBuilder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/formatter/GoFormattingModelBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.formatter; +package com.notzippy.intellij.go.intellij.formatter; -import com.goide.GoLanguage; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.GoLanguage; import com.intellij.formatting.*; import com.intellij.formatting.alignment.AlignmentStrategy; import com.intellij.lang.ASTNode; @@ -37,8 +37,8 @@ import java.util.Collections; import java.util.List; -import static com.goide.GoParserDefinition.*; -import static com.goide.GoTypes.*; +import static com.notzippy.intellij.go.intellij.GoParserDefinition.*; +import static com.notzippy.intellij.go.parser.GoTypes.*; public class GoFormattingModelBuilder implements FormattingModelBuilder { @NotNull @@ -200,8 +200,8 @@ private static Indent indentIfNotBrace(@NotNull ASTNode child) { } private static boolean isTopLevelDeclaration(@NotNull PsiElement element) { - return element instanceof GoPackageClause || element instanceof GoImportList - || element instanceof GoTopLevelDeclaration && element.getParent() instanceof GoFile; + return element instanceof GoPackageClause || element instanceof GoImportList + || element instanceof GoTopLevelDeclaration && element.getParent() instanceof GoFile; } private static Spacing lineBreak() { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoCodeStyleConfigurable.java b/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoCodeStyleConfigurable.java index 61fc30729f..852c49f770 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoCodeStyleConfigurable.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoCodeStyleConfigurable.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.formatter.settings; +package com.notzippy.intellij.go.intellij.formatter.settings; -import com.goide.GoConstants; -import com.goide.GoLanguage; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoLanguage; import com.intellij.application.options.CodeStyleAbstractConfigurable; import com.intellij.application.options.CodeStyleAbstractPanel; import com.intellij.application.options.TabbedLanguageCodeStylePanel; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoCodeStyleSettingsProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoCodeStyleSettingsProvider.java index 90f7d48b67..79bf313193 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoCodeStyleSettingsProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoCodeStyleSettingsProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.formatter.settings; +package com.notzippy.intellij.go.intellij.formatter.settings; -import com.goide.GoConstants; +import com.notzippy.intellij.go.intellij.GoConstants; import com.intellij.openapi.options.Configurable; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoLanguageCodeStyleSettingsProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoLanguageCodeStyleSettingsProvider.java index e1e621ebae..0b253e45c0 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoLanguageCodeStyleSettingsProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/formatter/settings/GoLanguageCodeStyleSettingsProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.formatter.settings; +package com.notzippy.intellij.go.intellij.formatter.settings; -import com.goide.GoLanguage; +import com.notzippy.intellij.go.intellij.GoLanguage; import com.intellij.application.options.IndentOptionsEditor; import com.intellij.application.options.SmartIndentOptionsEditor; import com.intellij.lang.Language; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestActionBase.java b/src/main/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestActionBase.java index e2bb73fa9c..6c22f2c658 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestActionBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestActionBase.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.generate; +package com.notzippy.intellij.go.intellij.generate; -import com.goide.runconfig.testing.GoTestFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFramework; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.CodeInsightAction; import com.intellij.openapi.editor.Editor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestMethodActionGroup.java b/src/main/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestMethodActionGroup.java index e5345ae452..ec7fe0320a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestMethodActionGroup.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestMethodActionGroup.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.generate; +package com.notzippy.intellij.go.intellij.generate; -import com.goide.runconfig.testing.GoTestFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFramework; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/go/GoGotoContributorBase.java b/src/main/java/com/notzippy/intellij/go/intellij/go/GoGotoContributorBase.java index beefdc4a47..3ac85f81ce 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/go/GoGotoContributorBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/go/GoGotoContributorBase.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.go; +package com.notzippy.intellij.go.intellij.go; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.navigation.ChooseByNameContributorEx; import com.intellij.navigation.GotoClassContributor; import com.intellij.navigation.NavigationItem; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/go/GoSymbolContributor.java b/src/main/java/com/notzippy/intellij/go/intellij/go/GoSymbolContributor.java index b641e8cccd..5dfc09b3b5 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/go/GoSymbolContributor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/go/GoSymbolContributor.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.go; +package com.notzippy.intellij.go.intellij.go; -import com.goide.psi.GoNamedElement; -import com.goide.stubs.index.GoAllPrivateNamesIndex; -import com.goide.stubs.index.GoAllPublicNamesIndex; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.stubs.index.GoAllPrivateNamesIndex; +import com.notzippy.intellij.go.stubs.index.GoAllPublicNamesIndex; public class GoSymbolContributor extends GoGotoContributorBase { public GoSymbolContributor() { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/go/GoTypeContributor.java b/src/main/java/com/notzippy/intellij/go/intellij/go/GoTypeContributor.java index 4325047f47..6294c07e80 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/go/GoTypeContributor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/go/GoTypeContributor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.go; +package com.notzippy.intellij.go.intellij.go; -import com.goide.psi.GoTypeSpec; -import com.goide.stubs.index.GoTypesIndex; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; +import com.notzippy.intellij.go.stubs.index.GoTypesIndex; public class GoTypeContributor extends GoGotoContributorBase { public GoTypeContributor() { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoAnnotator.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoAnnotator.java index 83b8f89bb8..8d658c2dc1 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoAnnotator.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoAnnotator.java @@ -14,18 +14,15 @@ * limitations under the License. */ -package com.goide.highlighting; +package com.notzippy.intellij.go.intellij.highlighting; -import com.goide.GoConstants; -import com.goide.GoTypes; -import com.goide.inspections.GoInspectionUtil; -import com.goide.psi.*; -import com.goide.psi.impl.GoCType; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoTypeUtil; -import com.goide.quickfix.GoDeleteRangeQuickFix; -import com.goide.quickfix.GoEmptySignatureQuickFix; -import com.goide.quickfix.GoReplaceWithReturnStatementQuickFix; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.impl.GoCType; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeUtil; +import com.notzippy.intellij.go.intellij.inspections.GoInspectionUtil; import com.google.common.collect.Sets; import com.intellij.lang.ASTNode; import com.intellij.lang.annotation.Annotation; @@ -64,13 +61,11 @@ public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder hold if (element instanceof GoContinueStatement) { if (!(PsiTreeUtil.getParentOfType(element, GoForStatement.class, GoFunctionLit.class) instanceof GoForStatement)) { Annotation annotation = holder.createErrorAnnotation(element, "Continue statement not inside a for loop"); - annotation.registerFix(new GoReplaceWithReturnStatementQuickFix(element)); } } else if (element instanceof GoBreakStatement) { if (GoPsiImplUtil.getBreakStatementOwner(element) == null) { Annotation annotation = holder.createErrorAnnotation(element, "Break statement not inside a for loop, select or switch"); - annotation.registerFix(new GoReplaceWithReturnStatementQuickFix(element)); } } else if (element instanceof GoReferenceExpression) { @@ -190,13 +185,11 @@ else if (element instanceof GoFunctionDeclaration) { if (result != null && !result.isVoid()) { Annotation annotation = holder.createErrorAnnotation(result, declaration.getName() + " function must have no arguments and no return values"); - annotation.registerFix(new GoEmptySignatureQuickFix(declaration)); } GoParameters parameters = signature.getParameters(); if (!parameters.getParameterDeclarationList().isEmpty()) { Annotation annotation = holder.createErrorAnnotation(parameters, declaration.getName() + " function must have no arguments and no return values"); - annotation.registerFix(new GoEmptySignatureQuickFix(declaration)); } } } @@ -216,7 +209,6 @@ else if (element instanceof GoIndexOrSliceExpr) { PsiElement secondColon = colons[1].getPsi(); TextRange r = TextRange.create(secondColon.getTextRange().getStartOffset(), thirdIndex.getTextRange().getEndOffset()); Annotation annotation = holder.createErrorAnnotation(r, "Invalid operation " + slice.getText() + " (3-index slice of string)"); - annotation.registerFix(new GoDeleteRangeQuickFix(secondColon, thirdIndex, "Delete third index")); } } } diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoColorsAndFontsPage.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoColorsAndFontsPage.java index dcac50b1ae..674a85ccbf 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoColorsAndFontsPage.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoColorsAndFontsPage.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.highlighting; +package com.notzippy.intellij.go.intellij.highlighting; -import com.goide.GoFileType; +import com.notzippy.intellij.go.intellij.GoFileType; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.options.colors.AttributesDescriptor; @@ -28,7 +28,7 @@ import javax.swing.*; import java.util.Map; -import static com.goide.highlighting.GoSyntaxHighlightingColors.*; +import static com.notzippy.intellij.go.intellij.highlighting.GoSyntaxHighlightingColors.*; public class GoColorsAndFontsPage implements ColorSettingsPage { private static final AttributesDescriptor[] DESCRIPTORS = new AttributesDescriptor[]{ diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoHighlightingAnnotator.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoHighlightingAnnotator.java index 35a9cb7b71..627d1ad77b 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoHighlightingAnnotator.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoHighlightingAnnotator.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.highlighting; +package com.notzippy.intellij.go.intellij.highlighting; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoReferenceBase; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoReferenceBase; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.Annotator; import com.intellij.openapi.application.ApplicationManager; @@ -34,7 +34,7 @@ import java.util.List; import java.util.stream.Collectors; -import static com.goide.highlighting.GoSyntaxHighlightingColors.*; +import static com.notzippy.intellij.go.intellij.highlighting.GoSyntaxHighlightingColors.*; public class GoHighlightingAnnotator implements Annotator { private static void highlightRefIfNeeded(@NotNull GoReferenceExpressionBase o, diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoProblemFileHighlightFilter.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoProblemFileHighlightFilter.java index 699ec880dc..e45a2fdce8 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoProblemFileHighlightFilter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoProblemFileHighlightFilter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.highlighting; +package com.notzippy.intellij.go.intellij.highlighting; -import com.goide.GoFileType; +import com.notzippy.intellij.go.intellij.GoFileType; import com.intellij.openapi.util.Condition; import com.intellij.openapi.vfs.VirtualFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlighter.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlighter.java index 8e2a74362e..8c95d22dfd 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlighter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlighter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.highlighting; +package com.notzippy.intellij.go.intellij.highlighting; -import com.goide.GoParserDefinition; -import com.goide.GoTypes; -import com.goide.lexer.GoLexer; +import com.notzippy.intellij.go.intellij.GoParserDefinition; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.lexer.GoLexer; import com.intellij.lexer.Lexer; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighterBase; @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.Map; -import static com.goide.highlighting.GoSyntaxHighlightingColors.*; +import static com.notzippy.intellij.go.intellij.highlighting.GoSyntaxHighlightingColors.*; public class GoSyntaxHighlighter extends SyntaxHighlighterBase { private static final Map ATTRIBUTES = new HashMap(); diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlighterFactory.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlighterFactory.java index 21bad2ce04..b7fb4aae4b 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlighterFactory.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlighterFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.highlighting; +package com.notzippy.intellij.go.intellij.highlighting; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlightingColors.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlightingColors.java index 2212734d96..4bb405ce63 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlightingColors.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/GoSyntaxHighlightingColors.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.highlighting; +package com.notzippy.intellij.go.intellij.highlighting; import com.intellij.openapi.editor.DefaultLanguageHighlighterColors; import com.intellij.openapi.editor.HighlighterColors; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoBreakStatementExitPointHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoBreakStatementExitPointHandler.java index fe56805242..615b78fe6e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoBreakStatementExitPointHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoBreakStatementExitPointHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.highlighting.exitpoint; +package com.notzippy.intellij.go.intellij.highlighting.exitpoint; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInsight.highlighting.HighlightUsagesHandlerBase; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoFunctionExitPointHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoFunctionExitPointHandler.java index 831ac7a33f..4fc144a796 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoFunctionExitPointHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoFunctionExitPointHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.highlighting.exitpoint; +package com.notzippy.intellij.go.intellij.highlighting.exitpoint; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInsight.highlighting.HighlightUsagesHandlerBase; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoHighlightExitPointsHandlerFactory.java b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoHighlightExitPointsHandlerFactory.java index 72c3959f83..12c1f79962 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoHighlightExitPointsHandlerFactory.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/highlighting/exitpoint/GoHighlightExitPointsHandlerFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.highlighting.exitpoint; +package com.notzippy.intellij.go.intellij.highlighting.exitpoint; -import com.goide.GoTypes; -import com.goide.psi.GoCallExpr; -import com.goide.psi.GoReferenceExpression; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.GoCallExpr; +import com.notzippy.intellij.go.grammar.psi.GoReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInsight.highlighting.HighlightUsagesHandlerBase; import com.intellij.codeInsight.highlighting.HighlightUsagesHandlerFactoryBase; import com.intellij.openapi.editor.Editor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAddTrailingCommaInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAddTrailingCommaInspection.java index 1fb874a17f..dcb5115f7a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAddTrailingCommaInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAddTrailingCommaInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoElement; -import com.goide.psi.GoVisitor; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoElement; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAnonymousFieldDefinitionTypeInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAnonymousFieldDefinitionTypeInspection.java index 4a4e6d2868..994874411c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAnonymousFieldDefinitionTypeInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAnonymousFieldDefinitionTypeInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoAnonymousFieldDefinition; -import com.goide.psi.GoVisitor; -import com.goide.quickfix.GoCreateWrapperTypeQuickFix; +import com.notzippy.intellij.go.grammar.psi.GoAnonymousFieldDefinition; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.intellij.quickfix.GoCreateWrapperTypeQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentNilWithoutExplicitTypeInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentNilWithoutExplicitTypeInspection.java index 5c4ea7effa..ad2762b6a2 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentNilWithoutExplicitTypeInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentNilWithoutExplicitTypeInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoConstants; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoReferenceExpressionImpl; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoReferenceExpressionImpl; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentToReceiverInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentToReceiverInspection.java index 5cbc185d73..2932359be6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentToReceiverInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentToReceiverInspection.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoPointerType; -import com.goide.psi.GoReceiver; -import com.goide.psi.GoReferenceExpression; -import com.goide.psi.GoUnaryExpr; -import com.goide.psi.GoVisitor; +import com.notzippy.intellij.go.grammar.psi.GoPointerType; +import com.notzippy.intellij.go.grammar.psi.GoReceiver; +import com.notzippy.intellij.go.grammar.psi.GoReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.GoUnaryExpr; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoBoolExpressionsInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoBoolExpressionsInspection.java index 16f7cb63f9..afeb72426f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoBoolExpressionsInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoBoolExpressionsInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoExpressionUtil; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.quickfix.GoSimplifyBoolExprQuickFix; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoExpressionUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.quickfix.GoSimplifyBoolExprQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.openapi.progress.ProgressManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoCgoInTestInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoCgoInTestInspection.java index e68cf3f3c9..e2e7493bb1 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoCgoInTestInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoCgoInTestInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoFile; -import com.goide.psi.GoImportSpec; -import com.goide.quickfix.GoDeleteImportQuickFix; -import com.goide.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteImportQuickFix; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; import com.intellij.codeInspection.ProblemsHolder; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoCommentStartInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoCommentStartInspection.java index 2e73d2fc83..edf1ef3c62 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoCommentStartInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoCommentStartInspection.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoConstants; -import com.goide.GoDocumentationProvider; -import com.goide.psi.GoCompositeElement; -import com.goide.psi.GoNamedElement; -import com.goide.psi.GoPackageClause; -import com.goide.psi.GoVisitor; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoDocumentationProvider; +import com.notzippy.intellij.go.grammar.psi.GoCompositeElement; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoPackageClause; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDeferGoInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDeferGoInspection.java index 8658d83b93..a95f9a9574 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDeferGoInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDeferGoInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.quickfix.GoDeleteQuickFix; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteQuickFix; import com.intellij.codeInspection.*; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDeferInLoopInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDeferInLoopInspection.java index 006856b2b6..a6eb01656d 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDeferInLoopInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDeferInLoopInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoDeferStatement; -import com.goide.psi.GoForStatement; -import com.goide.psi.GoFunctionLit; -import com.goide.psi.GoVisitor; +import com.notzippy.intellij.go.grammar.psi.GoDeferStatement; +import com.notzippy.intellij.go.grammar.psi.GoForStatement; +import com.notzippy.intellij.go.grammar.psi.GoFunctionLit; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDirectAssignToStructFieldInMapInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDirectAssignToStructFieldInMapInspection.java index 33057c20e6..0ffa8a0203 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDirectAssignToStructFieldInMapInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDirectAssignToStructFieldInMapInspection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.util.containers.ContainerUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateArgumentInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateArgumentInspection.java index 0a635e3a7f..6c6fd71f4d 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateArgumentInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateArgumentInspection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateFieldsOrMethodsInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateFieldsOrMethodsInspection.java index 8ce9e54ea9..7506fe36fa 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateFieldsOrMethodsInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateFieldsOrMethodsInspection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateFunctionOrMethodInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateFunctionOrMethodInspection.java index 12298784ef..0d267a4cff 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateFunctionOrMethodInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateFunctionOrMethodInspection.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.sdk.GoPackageUtil; -import com.goide.stubs.index.GoFunctionIndex; -import com.goide.stubs.index.GoIdFilter; -import com.goide.stubs.index.GoMethodIndex; -import com.goide.stubs.types.GoMethodDeclarationStubElementType; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.stubs.index.GoFunctionIndex; +import com.notzippy.intellij.go.stubs.index.GoIdFilter; +import com.notzippy.intellij.go.stubs.index.GoMethodIndex; +import com.notzippy.intellij.go.stubs.types.GoMethodDeclarationStubElementType; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.openapi.module.Module; @@ -34,8 +34,8 @@ import com.intellij.util.indexing.IdFilter; import org.jetbrains.annotations.NotNull; -import static com.goide.GoConstants.INIT; -import static com.goide.GoConstants.MAIN; +import static com.notzippy.intellij.go.intellij.GoConstants.INIT; +import static com.notzippy.intellij.go.intellij.GoConstants.MAIN; public class GoDuplicateFunctionOrMethodInspection extends GoInspectionBase { @NotNull diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateReturnArgumentInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateReturnArgumentInspection.java index 2ed7bd13c0..23ab9ab0ae 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateReturnArgumentInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoDuplicateReturnArgumentInspection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoEmbeddedInterfacePointerInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoEmbeddedInterfacePointerInspection.java index 819bcfdb28..9498a169bb 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoEmbeddedInterfacePointerInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoEmbeddedInterfacePointerInspection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoEmptyDeclarationInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoEmptyDeclarationInspection.java index 7f96edb2e0..3867a2b330 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoEmptyDeclarationInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoEmptyDeclarationInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoDocumentationProvider; -import com.goide.psi.*; -import com.goide.quickfix.GoDeleteQuickFix; +import com.notzippy.intellij.go.intellij.GoDocumentationProvider; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteQuickFix; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoExportedOwnDeclarationInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoExportedOwnDeclarationInspection.java index f36d0237b9..7c5e1e809d 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoExportedOwnDeclarationInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoExportedOwnDeclarationInspection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInspection.*; import com.intellij.diagnostic.AttachmentFactory; import com.intellij.openapi.command.WriteCommandAction; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFileIgnoredByBuildToolNotificationProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFileIgnoredByBuildToolNotificationProvider.java index b468d02779..d88d05451c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFileIgnoredByBuildToolNotificationProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFileIgnoredByBuildToolNotificationProvider.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoFileType; -import com.goide.project.GoModuleSettings; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.FileEditorManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFunctionCallInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFunctionCallInspection.java index 8eaf05ebe0..1f0ed72e44 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFunctionCallInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFunctionCallInspection.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFunctionVariadicParameterInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFunctionVariadicParameterInspection.java index 45457cef58..1fe84c9ad0 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFunctionVariadicParameterInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoFunctionVariadicParameterInspection.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.quickfix.GoDeleteQuickFix; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; @@ -26,7 +26,7 @@ import java.util.List; -import static com.goide.GoTypes.TRIPLE_DOT; +import static com.notzippy.intellij.go.parser.GoTypes.TRIPLE_DOT; public class GoFunctionVariadicParameterInspection extends GoInspectionBase { private static final GoDeleteQuickFix DELETE_QUICK_FIX = new GoDeleteQuickFix("Delete ...", TRIPLE_DOT); diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoImportUsedAsNameInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoImportUsedAsNameInspection.java index 0c86f6d561..1d339e29fc 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoImportUsedAsNameInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoImportUsedAsNameInspection.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.quickfix.GoRenameQuickFix; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.quickfix.GoRenameQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInfiniteForInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInfiniteForInspection.java index 0b4226c024..2711884070 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInfiniteForInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInfiniteForInspection.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.quickfix.GoReplaceWithSelectStatementQuickFix; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.quickfix.GoReplaceWithSelectStatementQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionBase.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionBase.java index abd22e89a0..04446b64df 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionBase.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoFile; -import com.goide.psi.GoVisitor; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInspection.*; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.psi.PsiElementVisitor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionUtil.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionUtil.java index c7c992cb2c..10659f52a6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionUtil.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionUtil.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidPackageImportInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidPackageImportInspection.java index 52c795a62e..6c0b566884 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidPackageImportInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidPackageImportInspection.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoConstants; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.GoFile; -import com.goide.psi.GoImportSpec; -import com.goide.psi.impl.imports.GoImportReference; -import com.goide.quickfix.GoDeleteImportQuickFix; -import com.goide.quickfix.GoDisableVendoringInModuleQuickFix; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.sdk.GoPackageUtil; -import com.goide.sdk.GoSdkService; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; +import com.notzippy.intellij.go.grammar.psi.impl.imports.GoImportReference; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteImportQuickFix; +import com.notzippy.intellij.go.intellij.quickfix.GoDisableVendoringInModuleQuickFix; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidStringOrCharInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidStringOrCharInspection.java index 5d9adddb60..48aa3e3392 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidStringOrCharInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidStringOrCharInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoLiteral; -import com.goide.psi.GoStringLiteral; -import com.goide.psi.GoVisitor; +import com.notzippy.intellij.go.grammar.psi.GoLiteral; +import com.notzippy.intellij.go.grammar.psi.GoStringLiteral; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMissingReturnInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMissingReturnInspection.java index aae86ca78a..c8c87b6738 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMissingReturnInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMissingReturnInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.highlighting.exitpoint.GoBreakStatementExitPointHandler; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.highlighting.exitpoint.GoBreakStatementExitPointHandler; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInsight.template.Template; import com.intellij.codeInsight.template.TemplateManager; import com.intellij.codeInsight.template.impl.TemplateSettings; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMixedNamedUnnamedParametersInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMixedNamedUnnamedParametersInspection.java index b7555b8c2f..7b312b4e59 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMixedNamedUnnamedParametersInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMixedNamedUnnamedParametersInspection.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMultiplePackagesInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMultiplePackagesInspection.java index 4bbf2c567b..609e7dcaf6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMultiplePackagesInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoMultiplePackagesInspection.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoConstants; -import com.goide.psi.GoFile; -import com.goide.psi.GoPackageClause; -import com.goide.quickfix.GoMultiplePackagesQuickFix; -import com.goide.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoPackageClause; +import com.notzippy.intellij.go.intellij.quickfix.GoMultiplePackagesQuickFix; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.ide.scratch.ScratchFileType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoNoNewVariablesInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoNoNewVariablesInspection.java index 662f454e00..8521a69547 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoNoNewVariablesInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoNoNewVariablesInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoPlaceholderChecker.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoPlaceholderChecker.java index e3e6d9d069..c2718e2a15 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoPlaceholderChecker.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoPlaceholderChecker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; @@ -28,8 +28,9 @@ import java.util.Map; import java.util.Set; -import static com.goide.GoConstants.TESTING_PATH; -import static com.goide.inspections.GoPlaceholderChecker.PrintfArgumentType.*; +import static com.notzippy.intellij.go.intellij.GoConstants.TESTING_PATH; +import static com.notzippy.intellij.go.intellij.inspections.GoPlaceholderChecker.PrintfArgumentType.*; +import static com.notzippy.intellij.go.intellij.inspections.GoPlaceholderChecker.PrintfArgumentType.*; public class GoPlaceholderChecker { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoPlaceholderCountInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoPlaceholderCountInspection.java index c1fc3b948a..27fe1177ea 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoPlaceholderCountInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoPlaceholderCountInspection.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.inspections.GoPlaceholderChecker.Placeholder; -import com.goide.inspections.GoPlaceholderChecker.PrintVerb; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoTypeUtil; +import com.notzippy.intellij.go.intellij.inspections.GoPlaceholderChecker.Placeholder; +import com.notzippy.intellij.go.intellij.inspections.GoPlaceholderChecker.PrintVerb; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeUtil; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRangeIterationOnIllegalTypeInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRangeIterationOnIllegalTypeInspection.java index ff25bd4587..c02e4936b3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRangeIterationOnIllegalTypeInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRangeIterationOnIllegalTypeInspection.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoExpression; -import com.goide.psi.GoRangeClause; -import com.goide.psi.GoType; -import com.goide.psi.GoVisitor; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoTypeUtil; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.GoRangeClause; +import com.notzippy.intellij.go.grammar.psi.GoType; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeUtil; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoReceiverNamesInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoReceiverNamesInspection.java index 9152c6898e..70f305a69d 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoReceiverNamesInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoReceiverNamesInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoReceiver; -import com.goide.psi.GoVisitor; -import com.goide.quickfix.GoRenameQuickFix; +import com.notzippy.intellij.go.grammar.psi.GoReceiver; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.intellij.quickfix.GoRenameQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedeclareImportAsFunctionInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedeclareImportAsFunctionInspection.java index 655bc816bb..e3f73e64da 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedeclareImportAsFunctionInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedeclareImportAsFunctionInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoVisitor; -import com.goide.quickfix.GoRenameQuickFix; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.intellij.quickfix.GoRenameQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.openapi.util.text.StringUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantBlankArgInRangeInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantBlankArgInRangeInspection.java index 8587af8e15..5125d2f9a5 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantBlankArgInRangeInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantBlankArgInRangeInspection.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.quickfix.GoDeleteRangeQuickFix; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteRangeQuickFix; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantSecondIndexInSlicesInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantSecondIndexInSlicesInspection.java index 4ee0a61592..b62a8795e1 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantSecondIndexInSlicesInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantSecondIndexInSlicesInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.quickfix.GoDeleteQuickFix; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteQuickFix; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantTypeDeclInCompositeLit.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantTypeDeclInCompositeLit.java index c85f5f40b2..dfd4a75b6c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantTypeDeclInCompositeLit.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantTypeDeclInCompositeLit.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.quickfix.GoDeleteAmpersandAndTypeInCompositeLitQuickFix; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteAmpersandAndTypeInCompositeLitQuickFix; import com.intellij.codeInspection.CleanupLocalInspectionTool; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoReservedWordUsedAsNameInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoReservedWordUsedAsNameInspection.java index 21c4b34d79..ee4d613875 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoReservedWordUsedAsNameInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoReservedWordUsedAsNameInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoTypeReference; -import com.goide.quickfix.GoRenameQuickFix; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeReference; +import com.notzippy.intellij.go.intellij.quickfix.GoRenameQuickFix; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoSelfImportInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoSelfImportInspection.java index fbe3e5c630..21c10cfb0f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoSelfImportInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoSelfImportInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoFile; -import com.goide.psi.GoImportSpec; -import com.goide.quickfix.GoDeleteImportQuickFix; -import com.goide.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteImportQuickFix; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.PsiDirectory; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoSpellcheckingStrategy.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoSpellcheckingStrategy.java index 03b685c326..a9e19ae797 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoSpellcheckingStrategy.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoSpellcheckingStrategy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoLanguage; +import com.notzippy.intellij.go.intellij.GoLanguage; import com.intellij.psi.PsiElement; import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStringAndByteTypeMismatchInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStringAndByteTypeMismatchInspection.java index b3ed93ed7f..e3bad2fdf4 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStringAndByteTypeMismatchInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStringAndByteTypeMismatchInspection.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoTypes; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoTypeUtil; -import com.goide.quickfix.GoConvertStringToByteQuickFix; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeUtil; +import com.notzippy.intellij.go.intellij.quickfix.GoConvertStringToByteQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemHighlightType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStructInitializationInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStructInitializationInspection.java index 67ffd12833..7b413e636a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStructInitializationInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStructInitializationInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.codeInspection.*; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.openapi.progress.ProgressManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStructTagInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStructTagInspection.java index 2a3854c7d8..47a5b3f813 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStructTagInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoStructTagInspection.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoFieldDeclaration; -import com.goide.psi.GoStructType; -import com.goide.psi.GoTag; -import com.goide.psi.GoVisitor; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.GoFieldDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoStructType; +import com.notzippy.intellij.go.grammar.psi.GoTag; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoTestSignaturesInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoTestSignaturesInspection.java index 86ea67d531..fa1ce3da45 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoTestSignaturesInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoTestSignaturesInspection.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoConstants; -import com.goide.psi.*; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.runconfig.testing.GoTestFunctionType; -import com.goide.runconfig.testing.frameworks.gotest.GotestGenerateAction; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFunctionType; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GotestGenerateAction; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUnderscoreUsedAsValueInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUnderscoreUsedAsValueInspection.java index 149cdce780..8af8b07683 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUnderscoreUsedAsValueInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUnderscoreUsedAsValueInspection.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoReferenceExpression; -import com.goide.psi.GoVisitor; +import com.notzippy.intellij.go.grammar.psi.GoReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUnusedImportInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUnusedImportInspection.java index e3498456b0..33db18ea99 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUnusedImportInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUnusedImportInspection.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.codeInsight.imports.GoImportOptimizer; -import com.goide.psi.GoFile; -import com.goide.psi.GoImportSpec; -import com.goide.psi.GoRecursiveVisitor; -import com.goide.psi.impl.GoElementFactory; -import com.goide.quickfix.GoRenameQuickFix; +import com.notzippy.intellij.go.intellij.codeInsight.imports.GoImportOptimizer; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; +import com.notzippy.intellij.go.grammar.psi.GoRecursiveVisitor; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.intellij.quickfix.GoRenameQuickFix; import com.intellij.codeInspection.*; import com.intellij.find.FindManager; import com.intellij.openapi.application.ApplicationManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUsedAsValueInCondition.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUsedAsValueInCondition.java index c8d494eda7..4de2cf3ea4 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUsedAsValueInCondition.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoUsedAsValueInCondition.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.GoAssignmentStatement; -import com.goide.psi.GoIfStatement; -import com.goide.psi.GoShortVarDeclaration; -import com.goide.psi.GoVisitor; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.GoAssignmentStatement; +import com.notzippy.intellij.go.grammar.psi.GoIfStatement; +import com.notzippy.intellij.go.grammar.psi.GoShortVarDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoVarDeclarationInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoVarDeclarationInspection.java index 53d9a63027..917c85faec 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoVarDeclarationInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/GoVarDeclarationInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoTypeUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeUtil; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; @@ -29,8 +29,8 @@ import java.util.List; -import static com.goide.inspections.GoInspectionUtil.UNKNOWN_COUNT; -import static com.goide.inspections.GoInspectionUtil.getExpressionResultCount; +import static com.notzippy.intellij.go.intellij.inspections.GoInspectionUtil.UNKNOWN_COUNT; +import static com.notzippy.intellij.go.intellij.inspections.GoInspectionUtil.getExpressionResultCount; public class GoVarDeclarationInspection extends GoInspectionBase { @NotNull diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/WrongModuleTypeNotificationProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/WrongModuleTypeNotificationProvider.java index cea56b4341..705b70ebd0 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/WrongModuleTypeNotificationProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/WrongModuleTypeNotificationProvider.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoFileType; -import com.goide.GoModuleType; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.intellij.GoModuleType; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/WrongSdkConfigurationNotificationProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/WrongSdkConfigurationNotificationProvider.java index 7eda22de9e..f9f7164132 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/WrongSdkConfigurationNotificationProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/WrongSdkConfigurationNotificationProvider.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoFileType; -import com.goide.GoLanguage; -import com.goide.configuration.GoLibrariesConfigurableProvider; -import com.goide.project.GoLibrariesService; -import com.goide.sdk.GoSdkService; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.intellij.GoLanguage; +import com.notzippy.intellij.go.intellij.configuration.GoLibrariesConfigurableProvider; +import com.notzippy.intellij.go.intellij.project.GoLibrariesService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.ProjectTopics; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.fileEditor.FileEditor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/suppression/GoInspectionSuppressor.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/suppression/GoInspectionSuppressor.java index 046904e0e2..1042fb41b4 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/suppression/GoInspectionSuppressor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/suppression/GoInspectionSuppressor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections.suppression; +package com.notzippy.intellij.go.intellij.inspections.suppression; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInsight.daemon.impl.actions.AbstractBatchSuppressByNoInspectionCommentFix; import com.intellij.codeInspection.InspectionSuppressor; import com.intellij.codeInspection.SuppressQuickFix; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoAssignmentToConstantInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoAssignmentToConstantInspection.java index 141d9d9211..44e9264b21 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoAssignmentToConstantInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoAssignmentToConstantInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.inspections.GoInspectionBase; -import com.goide.psi.GoConstDefinition; -import com.goide.psi.GoReferenceExpression; -import com.goide.psi.GoVisitor; +import com.notzippy.intellij.go.intellij.inspections.GoInspectionBase; +import com.notzippy.intellij.go.grammar.psi.GoConstDefinition; +import com.notzippy.intellij.go.grammar.psi.GoReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceFunctionFix.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceFunctionFix.java index 12aa69b17c..185ae5db6f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceFunctionFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceFunctionFix.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; - -import com.goide.GoConstants; -import com.goide.GoDocumentationProvider; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoTypeUtil; -import com.goide.refactor.GoRefactoringUtil; -import com.goide.util.GoPathScopeHelper; -import com.goide.util.GoUtil; +package com.notzippy.intellij.go.intellij.inspections.unresolved; + +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoDocumentationProvider; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeUtil; +import com.notzippy.intellij.go.intellij.refactor.GoRefactoringUtil; +import com.notzippy.intellij.go.intellij.util.GoPathScopeHelper; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.codeInsight.template.Template; import com.intellij.codeInsight.template.TemplateManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceGlobalConstantFix.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceGlobalConstantFix.java index 8f8927cd9a..1756d10e60 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceGlobalConstantFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceGlobalConstantFix.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceGlobalVariableFix.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceGlobalVariableFix.java index d0fd24262b..3447d9d380 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceGlobalVariableFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceGlobalVariableFix.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceLocalConstantFix.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceLocalConstantFix.java index 003425949d..1db188f486 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceLocalConstantFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceLocalConstantFix.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.refactor.GoRefactoringUtil; +import com.notzippy.intellij.go.intellij.refactor.GoRefactoringUtil; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceLocalVariableFix.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceLocalVariableFix.java index 178c9aa525..9443b50c10 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceLocalVariableFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceLocalVariableFix.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.refactor.GoRefactoringUtil; +import com.notzippy.intellij.go.intellij.refactor.GoRefactoringUtil; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceTypeFix.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceTypeFix.java index 0cbe171145..a83acb48eb 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceTypeFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoIntroduceTypeFix.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoReplaceAssignmentWithDeclarationQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoReplaceAssignmentWithDeclarationQuickFix.java index 9df347b32b..27fb42671f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoReplaceAssignmentWithDeclarationQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoReplaceAssignmentWithDeclarationQuickFix.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.psi.GoAssignmentStatement; -import com.goide.psi.GoExpression; -import com.goide.psi.GoRangeClause; -import com.goide.psi.GoRecvStatement; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.GoAssignmentStatement; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.GoRangeClause; +import com.notzippy.intellij.go.grammar.psi.GoRecvStatement; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInspection.LocalQuickFixOnPsiElement; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnresolvedFixBase.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnresolvedFixBase.java index c5a998eadc..1d851d9542 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnresolvedFixBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnresolvedFixBase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.psi.GoReferenceExpressionBase; -import com.goide.refactor.GoRefactoringUtil; +import com.notzippy.intellij.go.grammar.psi.GoReferenceExpressionBase; +import com.notzippy.intellij.go.intellij.refactor.GoRefactoringUtil; import com.intellij.codeInsight.template.Template; import com.intellij.codeInsight.template.TemplateManager; import com.intellij.codeInsight.template.impl.TemplateSettings; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnresolvedReferenceInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnresolvedReferenceInspection.java index 34444ce28b..a309760256 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnresolvedReferenceInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnresolvedReferenceInspection.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.GoTypes; -import com.goide.codeInsight.imports.GoImportPackageQuickFix; -import com.goide.inspections.GoInspectionBase; -import com.goide.psi.*; -import com.goide.psi.impl.GoReference; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.intellij.codeInsight.imports.GoImportPackageQuickFix; +import com.notzippy.intellij.go.intellij.inspections.GoInspectionBase; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoReference; import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.LocalQuickFix; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedConstInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedConstInspection.java index 0bcdab0cc9..68ab4cbdbb 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedConstInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedConstInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.inspections.GoInspectionBase; -import com.goide.psi.GoConstDefinition; -import com.goide.psi.GoVisitor; -import com.goide.quickfix.GoDeleteConstDefinitionQuickFix; +import com.notzippy.intellij.go.intellij.inspections.GoInspectionBase; +import com.notzippy.intellij.go.grammar.psi.GoConstDefinition; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteConstDefinitionQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedExportedFunctionInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedExportedFunctionInspection.java index 99442e9665..526361c2ea 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedExportedFunctionInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedExportedFunctionInspection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; import com.intellij.openapi.util.text.StringUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedFunctionInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedFunctionInspection.java index 72ee18be4f..8baeded841 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedFunctionInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedFunctionInspection.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.GoConstants; -import com.goide.inspections.GoInspectionBase; -import com.goide.psi.GoFile; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoVisitor; -import com.goide.quickfix.GoDeleteQuickFix; -import com.goide.quickfix.GoRenameToBlankQuickFix; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.runconfig.testing.GoTestFunctionType; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.inspections.GoInspectionBase; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteQuickFix; +import com.notzippy.intellij.go.intellij.quickfix.GoRenameToBlankQuickFix; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFunctionType; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedGlobalVariableInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedGlobalVariableInspection.java index e04ab2d15f..824f1dc35b 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedGlobalVariableInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedGlobalVariableInspection.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.psi.GoVarDeclaration; -import com.goide.psi.GoVarDefinition; -import com.goide.quickfix.GoDeleteVarDefinitionQuickFix; +import com.notzippy.intellij.go.grammar.psi.GoVarDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoVarDefinition; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteVarDefinitionQuickFix; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedLabelInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedLabelInspection.java index d5e2cf7eb0..2af1bde929 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedLabelInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedLabelInspection.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.inspections.GoInspectionBase; -import com.goide.psi.GoLabelDefinition; -import com.goide.psi.GoLabeledStatement; -import com.goide.psi.GoStatement; -import com.goide.psi.GoVisitor; -import com.goide.quickfix.GoRenameToBlankQuickFix; +import com.notzippy.intellij.go.intellij.inspections.GoInspectionBase; +import com.notzippy.intellij.go.grammar.psi.GoLabelDefinition; +import com.notzippy.intellij.go.grammar.psi.GoLabeledStatement; +import com.notzippy.intellij.go.grammar.psi.GoStatement; +import com.notzippy.intellij.go.grammar.psi.GoVisitor; +import com.notzippy.intellij.go.intellij.quickfix.GoRenameToBlankQuickFix; import com.intellij.codeInspection.*; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedParameterInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedParameterInspection.java index 20a573213a..5e0a1b5ecd 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedParameterInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedParameterInspection.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.inspections.GoInspectionBase; -import com.goide.psi.*; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.runconfig.testing.GoTestFunctionType; +import com.notzippy.intellij.go.intellij.inspections.GoInspectionBase; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFunctionType; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedVariableInspection.java b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedVariableInspection.java index e4b555a1ea..a0dc1c02ee 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedVariableInspection.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/inspections/unresolved/GoUnusedVariableInspection.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.inspections.unresolved; +package com.notzippy.intellij.go.intellij.inspections.unresolved; -import com.goide.inspections.GoInspectionBase; -import com.goide.psi.*; -import com.goide.psi.impl.GoVarProcessor; -import com.goide.quickfix.GoDeleteVarDefinitionQuickFix; -import com.goide.quickfix.GoRenameToBlankQuickFix; +import com.notzippy.intellij.go.intellij.inspections.GoInspectionBase; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoVarProcessor; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteVarDefinitionQuickFix; +import com.notzippy.intellij.go.intellij.quickfix.GoRenameToBlankQuickFix; import com.intellij.codeInspection.LocalInspectionToolSession; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/intentions/GoAddFunctionBlockIntention.java b/src/main/java/com/notzippy/intellij/go/intellij/intentions/GoAddFunctionBlockIntention.java index b9f11687bc..0ae012027e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/intentions/GoAddFunctionBlockIntention.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/intentions/GoAddFunctionBlockIntention.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.intentions; +package com.notzippy.intellij.go.intellij.intentions; -import com.goide.editor.smart.GoSmartEnterProcessor; -import com.goide.psi.GoBlock; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.intellij.editor.smart.GoSmartEnterProcessor; +import com.notzippy.intellij.go.grammar.psi.GoBlock; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.codeInsight.intention.BaseElementAtCaretIntentionAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/intentions/GoMoveToStructInitializationIntention.java b/src/main/java/com/notzippy/intellij/go/intellij/intentions/GoMoveToStructInitializationIntention.java index 0040439367..7958273147 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/intentions/GoMoveToStructInitializationIntention.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/intentions/GoMoveToStructInitializationIntention.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.intentions; +package com.notzippy.intellij.go.intellij.intentions; -import com.goide.psi.*; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInsight.intention.BaseElementAtCaretIntentionAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/marker/GoRecursiveCallMarkerProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/marker/GoRecursiveCallMarkerProvider.java index 9dff3e2f06..f11dc59d3a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/marker/GoRecursiveCallMarkerProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/marker/GoRecursiveCallMarkerProvider.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.marker; +package com.notzippy.intellij.go.intellij.marker; -import com.goide.psi.GoCallExpr; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.GoCallExpr; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeHighlighting.Pass; import com.intellij.codeInsight.daemon.LineMarkerInfo; import com.intellij.codeInsight.daemon.LineMarkerProvider; @@ -75,7 +75,7 @@ private RecursiveMethodCallMarkerInfo(@NotNull PsiElement methodCall) { super(methodCall, methodCall.getTextRange(), AllIcons.Gutter.RecursiveMethod, - Pass.UPDATE_OVERRIDDEN_MARKERS, + Pass.UPDATE_ALL, FunctionUtil.constant("Recursive call"), null, GutterIconRenderer.Alignment.RIGHT diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoApplicationLibrariesService.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoApplicationLibrariesService.java index e8f48205d2..90d8660bda 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoApplicationLibrariesService.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoApplicationLibrariesService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; -import com.goide.GoConstants; -import com.goide.GoLibrariesState; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.goide.GoLibrariesState; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; @@ -28,7 +28,7 @@ @State( name = GoConstants.GO_LIBRARIES_SERVICE_NAME, - storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/" + GoConstants.GO_LIBRARIES_CONFIG_FILE) + storages = @Storage(value = GoConstants.GO_LIBRARIES_CONFIG_FILE) ) public class GoApplicationLibrariesService extends GoLibrariesService { @NotNull diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoBuildTargetSettings.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoBuildTargetSettings.java index b21174a1ad..a4e16625b7 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoBuildTargetSettings.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoBuildTargetSettings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; import com.intellij.openapi.util.SimpleModificationTracker; import com.intellij.util.ArrayUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoExcludedPathsSettings.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoExcludedPathsSettings.java index cd3d0c841e..26290d17ea 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoExcludedPathsSettings.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoExcludedPathsSettings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; import com.intellij.openapi.components.*; import com.intellij.openapi.project.Project; @@ -26,50 +26,47 @@ import org.jetbrains.annotations.Nullable; @State( - name = "GoExcludedPaths", - storages = { - @Storage(id = "default", file = StoragePathMacros.PROJECT_FILE), - @Storage(id = "dir", file = StoragePathMacros.PROJECT_CONFIG_DIR + "/goExcludedPaths.xml", scheme = StorageScheme.DIRECTORY_BASED) - } + name = "GoExcludedPaths", + storages = @Storage(file = StoragePathMacros.CACHE_FILE + "/editor.excluded.xml") ) public class GoExcludedPathsSettings extends SimpleModificationTracker implements PersistentStateComponent { - private String[] myExcludedPackages = ArrayUtil.EMPTY_STRING_ARRAY; + private String[] myExcludedPackages = ArrayUtil.EMPTY_STRING_ARRAY; - public static GoExcludedPathsSettings getInstance(Project project) { - return ServiceManager.getService(project, GoExcludedPathsSettings.class); - } - - @Nullable - @Override - public GoExcludedPathsSettings getState() { - return this; - } + public static GoExcludedPathsSettings getInstance(Project project) { + return ServiceManager.getService(project, GoExcludedPathsSettings.class); + } - @Override - public void loadState(GoExcludedPathsSettings state) { - XmlSerializerUtil.copyBean(state, this); - } + @Nullable + @Override + public GoExcludedPathsSettings getState() { + return this; + } - public String[] getExcludedPackages() { - return myExcludedPackages; - } + @Override + public void loadState(GoExcludedPathsSettings state) { + XmlSerializerUtil.copyBean(state, this); + } - public void setExcludedPackages(String... excludedPackages) { - myExcludedPackages = excludedPackages; - incModificationCount(); - } + public String[] getExcludedPackages() { + return myExcludedPackages; + } - public boolean isExcluded(@Nullable String importPath) { - if (importPath == null) { - return false; + public void setExcludedPackages(String... excludedPackages) { + myExcludedPackages = excludedPackages; + incModificationCount(); } - for (String excludedPath : myExcludedPackages) { - if (FileUtil.isAncestor(excludedPath, importPath, false)) return true; + + public boolean isExcluded(@Nullable String importPath) { + if (importPath == null) { + return false; + } + for (String excludedPath : myExcludedPackages) { + if (FileUtil.isAncestor(excludedPath, importPath, false)) return true; + } + return false; } - return false; - } - public void excludePath(@NotNull String importPath) { - setExcludedPackages(ArrayUtil.append(myExcludedPackages, importPath)); - } + public void excludePath(@NotNull String importPath) { + setExcludedPackages(ArrayUtil.append(myExcludedPackages, importPath)); + } } diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoLibrariesService.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoLibrariesService.java index 5bff452f64..e228035f22 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoLibrariesService.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoLibrariesService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; -import com.goide.GoLibrariesState; +import com.notzippy.intellij.go.goide.GoLibrariesState; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleLibrariesInitializer.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleLibrariesInitializer.java index 4a24d5785d..34866e94ed 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleLibrariesInitializer.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleLibrariesInitializer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; -import com.goide.GoConstants; -import com.goide.configuration.GoLibrariesConfigurableProvider; -import com.goide.sdk.GoSdkService; -import com.goide.sdk.GoSdkUtil; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.configuration.GoLibrariesConfigurableProvider; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.ProjectTopics; import com.intellij.ide.util.PropertiesComponent; import com.intellij.notification.Notification; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleLibrariesService.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleLibrariesService.java index f359e92b91..23f2dd214f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleLibrariesService.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleLibrariesService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; -import com.goide.GoConstants; -import com.goide.GoLibrariesState; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.goide.GoLibrariesState; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.components.StoragePathMacros; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleSettings.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleSettings.java index 58d9877012..5468331f29 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleSettings.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoModuleSettings.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; -import com.goide.GoConstants; -import com.goide.configuration.GoConfigurableProvider; -import com.goide.configuration.GoModuleSettingsConfigurable; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.configuration.GoConfigurableProvider; +import com.notzippy.intellij.go.intellij.configuration.GoModuleSettingsConfigurable; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.PersistentStateComponent; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoProjectLibrariesService.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoProjectLibrariesService.java index b3949a2ae1..18d1b2a64a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoProjectLibrariesService.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoProjectLibrariesService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; -import com.goide.GoConstants; -import com.goide.GoLibrariesState; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.goide.GoLibrariesState; import com.intellij.openapi.components.*; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; @@ -25,8 +25,7 @@ @State( name = GoConstants.GO_LIBRARIES_SERVICE_NAME, storages = { - @Storage(id = "default", file = StoragePathMacros.PROJECT_FILE), - @Storage(id = "dir", file = StoragePathMacros.PROJECT_CONFIG_DIR + "/" + GoConstants.GO_LIBRARIES_CONFIG_FILE, scheme = StorageScheme.DIRECTORY_BASED) + @Storage(value = GoConstants.GO_LIBRARIES_CONFIG_FILE) } ) public class GoProjectLibrariesService extends GoLibrariesService { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoProjectStructureDetector.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoProjectStructureDetector.java index 429f390aaa..2a6e4221df 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoProjectStructureDetector.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoProjectStructureDetector.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; -import com.goide.GoConstants; -import com.goide.GoModuleType; -import com.goide.sdk.GoSdkType; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoModuleType; +import com.notzippy.intellij.go.intellij.sdk.GoSdkType; import com.intellij.ide.util.importProject.ModuleDescriptor; import com.intellij.ide.util.importProject.ProjectDescriptor; import com.intellij.ide.util.projectWizard.ModuleWizardStep; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/GoVendoringUtil.java b/src/main/java/com/notzippy/intellij/go/intellij/project/GoVendoringUtil.java index 5061c1b2ee..e98c4e0128 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/GoVendoringUtil.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/GoVendoringUtil.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.project; +package com.notzippy.intellij.go.intellij.project; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.openapi.module.Module; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ThreeState; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/migration/GoBuildTagsSettingsConverterProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/project/migration/GoBuildTagsSettingsConverterProvider.java index 718ba0d6c9..d881fdaf9c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/migration/GoBuildTagsSettingsConverterProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/migration/GoBuildTagsSettingsConverterProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.project.migration; +package com.notzippy.intellij.go.intellij.project.migration; -import com.goide.GoConstants; -import com.goide.project.GoBuildTargetSettings; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.project.GoBuildTargetSettings; import com.intellij.conversion.*; import com.intellij.ide.impl.convert.JDomConvertingUtil; import com.intellij.util.xmlb.XmlSerializer; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/project/migration/GoProjectModelConverterProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/project/migration/GoProjectModelConverterProvider.java index 5c417f2c2f..ee04e4d3a3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/project/migration/GoProjectModelConverterProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/project/migration/GoProjectModelConverterProvider.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.project.migration; +package com.notzippy.intellij.go.intellij.project.migration; -import com.goide.GoConstants; -import com.goide.project.GoApplicationLibrariesService; -import com.goide.project.GoProjectLibrariesService; -import com.goide.sdk.GoSdkType; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.project.GoApplicationLibrariesService; +import com.notzippy.intellij.go.intellij.project.GoProjectLibrariesService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkType; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.conversion.*; import com.intellij.ide.impl.convert.JDomConvertingUtil; import com.intellij.openapi.application.AccessToken; @@ -29,7 +29,6 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl; import com.intellij.openapi.roots.OrderRootType; -import com.intellij.openapi.roots.impl.ProjectRootManagerImpl; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -84,10 +83,13 @@ public ConversionProcessor createModuleFileConverter() { public ConversionProcessor createRunConfigurationsConverter() { return new RunConfigurationsConverter(); } + @Override public boolean isConversionNeeded() { Element component = getProjectRootManager(context); return component != null && isGoSdkType(component.getAttributeValue(PROJECT_JDK_TYPE_ATTR)); + + // TODO throw new UnsupportedOperationException("not implemented"); } @Override @@ -152,6 +154,7 @@ public boolean isConversionNeeded(@NotNull ProjectSettings settings) { return projectRootManager != null && isGoSdkType(projectRootManager.getAttributeValue(PROJECT_JDK_TYPE_ATTR)); } + @Override public void process(@NotNull ProjectSettings settings) throws CannotConvertException { Element projectRootManager = getProjectRootManager(settings.getRootElement()); @@ -210,6 +213,7 @@ private static Element getProjectRootManager(@Nullable Element rootElement) { private static void updateSdkType(@NotNull File file, @NotNull Element projectRootManager) throws CannotConvertException { projectRootManager.setAttribute(PROJECT_JDK_TYPE_ATTR, GoConstants.SDK_TYPE_ID); saveFile(file, projectRootManager, "Cannot save sdk type changing"); + } @NotNull diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoConvertStringToByteQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoConvertStringToByteQuickFix.java index b54a5e8b2a..b815595147 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoConvertStringToByteQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoConvertStringToByteQuickFix.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.psi.GoConditionalExpr; -import com.goide.psi.GoStringLiteral; +import com.notzippy.intellij.go.grammar.psi.GoConditionalExpr; +import com.notzippy.intellij.go.grammar.psi.GoStringLiteral; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; @@ -28,8 +28,8 @@ import java.util.Arrays; -import static com.goide.psi.impl.GoElementFactory.createExpression; -import static com.goide.psi.impl.GoPsiImplUtil.isSingleCharLiteral; +import static com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory.createExpression; +import static com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil.isSingleCharLiteral; import static java.lang.String.format; public class GoConvertStringToByteQuickFix extends LocalQuickFixBase { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateWrapperTypeQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateWrapperTypeQuickFix.java index 805ef90fa0..fc4b714c65 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateWrapperTypeQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateWrapperTypeQuickFix.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.psi.GoType; -import com.goide.psi.GoTypeDeclaration; -import com.goide.psi.GoTypeSpec; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoType; +import com.notzippy.intellij.go.grammar.psi.GoTypeDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.codeInsight.CodeInsightUtilCore; import com.intellij.codeInsight.template.Template; import com.intellij.codeInsight.template.TemplateBuilderImpl; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteAmpersandAndTypeInCompositeLitQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteAmpersandAndTypeInCompositeLitQuickFix.java index 47fe506e3b..08e3b830ba 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteAmpersandAndTypeInCompositeLitQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteAmpersandAndTypeInCompositeLitQuickFix.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoRedundantTypeDeclInCompositeLit; -import com.goide.psi.*; +import com.notzippy.intellij.go.intellij.inspections.GoRedundantTypeDeclInCompositeLit; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteConstDefinitionQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteConstDefinitionQuickFix.java index 8113202a03..d13ab00e00 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteConstDefinitionQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteConstDefinitionQuickFix.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.psi.GoConstDefinition; -import com.goide.psi.GoConstSpec; +import com.notzippy.intellij.go.grammar.psi.GoConstDefinition; +import com.notzippy.intellij.go.grammar.psi.GoConstSpec; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteImportQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteImportQuickFix.java index ddeda431bc..dbff1506f6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteImportQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteImportQuickFix.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.psi.GoFile; -import com.goide.psi.GoImportSpec; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.command.WriteCommandAction; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteQuickFix.java index bf56aa3c71..de4d7f9c24 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteQuickFix.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteRangeQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteRangeQuickFix.java index 2700928553..daddc59dee 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteRangeQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteRangeQuickFix.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement; import com.intellij.openapi.diagnostic.Logger; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteVarDefinitionQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteVarDefinitionQuickFix.java index 2e42ab30f3..2eb406db09 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteVarDefinitionQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteVarDefinitionQuickFix.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.psi.GoVarDefinition; -import com.goide.psi.GoVarSpec; +import com.notzippy.intellij.go.grammar.psi.GoVarDefinition; +import com.notzippy.intellij.go.grammar.psi.GoVarSpec; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDisableVendoringInModuleQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDisableVendoringInModuleQuickFix.java index 47538bc88e..87ca836d30 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDisableVendoringInModuleQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoDisableVendoringInModuleQuickFix.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.project.GoModuleSettings; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.module.Module; @@ -26,8 +26,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.goide.project.GoVendoringUtil.isVendoringEnabled; -import static com.goide.project.GoVendoringUtil.vendoringCanBeDisabled; +import static com.notzippy.intellij.go.intellij.project.GoVendoringUtil.isVendoringEnabled; +import static com.notzippy.intellij.go.intellij.project.GoVendoringUtil.vendoringCanBeDisabled; public class GoDisableVendoringInModuleQuickFix extends LocalQuickFixBase { @NotNull private final Module myModule; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoEmptySignatureQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoEmptySignatureQuickFix.java index 37ae6258f3..b8a6c9eef9 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoEmptySignatureQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoEmptySignatureQuickFix.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoSignature; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoSignature; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoMultiplePackagesQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoMultiplePackagesQuickFix.java index 8cd930b0d6..78e3ca85e4 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoMultiplePackagesQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoMultiplePackagesQuickFix.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.GoConstants; -import com.goide.psi.GoFile; -import com.goide.psi.GoPackageClause; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoPackageClause; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement; import com.intellij.openapi.Disposable; import com.intellij.openapi.command.WriteCommandAction; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameQuickFix.java index 56cc565d28..d3577377f6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameQuickFix.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInspection.LocalQuickFixOnPsiElement; import com.intellij.ide.DataManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameToBlankQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameToBlankQuickFix.java index ad9b819818..9b56454d6f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameToBlankQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameToBlankQuickFix.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoNoNewVariablesInspection; -import com.goide.psi.GoNamedElement; -import com.goide.psi.GoVarDefinition; -import com.goide.psi.GoVarSpec; +import com.notzippy.intellij.go.intellij.inspections.GoNoNewVariablesInspection; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoVarDefinition; +import com.notzippy.intellij.go.grammar.psi.GoVarSpec; import com.intellij.codeInspection.LocalQuickFixOnPsiElement; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithReturnStatementQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithReturnStatementQuickFix.java index 5aed08db12..518b006d26 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithReturnStatementQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithReturnStatementQuickFix.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.psi.GoStatement; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoStatement; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Editor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithSelectStatementQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithSelectStatementQuickFix.java index 542858d1e7..927da3121f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithSelectStatementQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithSelectStatementQuickFix.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.psi.GoForStatement; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoForStatement; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.codeInspection.LocalQuickFixBase; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoSimplifyBoolExprQuickFix.java b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoSimplifyBoolExprQuickFix.java index 300242e22c..dfca703377 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoSimplifyBoolExprQuickFix.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/quickfix/GoSimplifyBoolExprQuickFix.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoBoolExpressionsInspection; -import com.goide.psi.GoAndExpr; -import com.goide.psi.GoBinaryExpr; -import com.goide.psi.GoExpression; -import com.goide.psi.GoReferenceExpression; -import com.goide.psi.impl.GoElementFactory; -import com.goide.psi.impl.GoExpressionUtil; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.inspections.GoBoolExpressionsInspection; +import com.notzippy.intellij.go.grammar.psi.GoAndExpr; +import com.notzippy.intellij.go.grammar.psi.GoBinaryExpr; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.GoReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.impl.GoExpressionUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.codeInspection.LocalQuickFixOnPsiElement; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoAnonymousFieldProcessor.java b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoAnonymousFieldProcessor.java index 1ff7f12e65..f380042a9e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoAnonymousFieldProcessor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoAnonymousFieldProcessor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.search.SearchScope; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoDescriptionProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoDescriptionProvider.java index 308908facd..f2a365777c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoDescriptionProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoDescriptionProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.codeInsight.highlighting.HighlightUsagesDescriptionLocation; import com.intellij.psi.ElementDescriptionLocation; import com.intellij.psi.ElementDescriptionProvider; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceOperation.java b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceOperation.java index 22e3e7a4f5..5d32f84e0c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceOperation.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceOperation.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; -import com.goide.psi.GoExpression; -import com.goide.psi.GoVarDefinition; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.GoVarDefinition; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableBase.java b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableBase.java index 57cd79b877..ec927eda49 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableBase.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; -import com.goide.inspections.GoInspectionUtil; -import com.goide.psi.*; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.intellij.inspections.GoInspectionUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Editor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableDialog.java b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableDialog.java index fd3abc1a31..006c2016c3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableDialog.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableDialog.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; -import com.goide.GoFileType; -import com.goide.GoNamesValidator; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.intellij.GoNamesValidator; import com.intellij.openapi.options.ConfigurationException; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.ui.NameSuggestionsField; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableHandler.java index 71b298b4c6..9fba060ce9 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.editor.Editor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRefactoringSupportProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRefactoringSupportProvider.java index 6e72b9fa6b..1cdd385dba 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRefactoringSupportProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRefactoringSupportProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.lang.refactoring.RefactoringSupportProvider; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringActionHandler; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRefactoringUtil.java b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRefactoringUtil.java index bbc614781b..2579f77742 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRefactoringUtil.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRefactoringUtil.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; -import com.goide.GoLanguage; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.GoTypeUtil; +import com.notzippy.intellij.go.intellij.GoLanguage; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeUtil; import com.intellij.codeInsight.PsiEquivalenceUtil; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRenameImportSpecProcessor.java b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRenameImportSpecProcessor.java index 213556e011..f19c56c3d5 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRenameImportSpecProcessor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/refactor/GoRenameImportSpecProcessor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; -import com.goide.psi.GoImportSpec; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; import com.intellij.find.FindManager; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpLanguage.java b/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpLanguage.java index fd1b7414ba..75f50fda24 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpLanguage.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpLanguage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.regexp; +package com.notzippy.intellij.go.intellij.regexp; import com.intellij.lang.Language; import org.intellij.lang.regexp.RegExpLanguage; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpParserDefinition.java b/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpParserDefinition.java index 374fb55f8e..6f840b2f41 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpParserDefinition.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpParserDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.regexp; +package com.notzippy.intellij.go.intellij.regexp; import com.intellij.lang.PsiParser; import com.intellij.lexer.Lexer; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegexHost.java b/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegexHost.java index 4c8f6eb43d..f1f375a824 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegexHost.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegexHost.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.regexp; +package com.notzippy.intellij.go.intellij.regexp; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegexInjector.java b/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegexInjector.java index 079e56ac4b..412e3cdbe2 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegexInjector.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/regexp/GoRegexInjector.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.regexp; +package com.notzippy.intellij.go.intellij.regexp; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.psi.*; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoBuildingRunner.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoBuildingRunner.java index 866b3346d1..6f81aee18f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoBuildingRunner.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoBuildingRunner.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.runconfig; - -import com.goide.GoEnvironmentUtil; -import com.goide.dlv.DlvDebugProcess; -import com.goide.dlv.DlvRemoteVmConnection; -import com.goide.runconfig.application.GoApplicationConfiguration; -import com.goide.runconfig.application.GoApplicationRunningState; -import com.goide.util.GoHistoryProcessListener; +package com.notzippy.intellij.go.intellij.runconfig; + +import com.notzippy.intellij.go.goide.GoEnvironmentUtil; +import com.notzippy.intellij.go.intellij.dlv.DlvDebugProcess; +import com.notzippy.intellij.go.intellij.dlv.DlvRemoteVmConnection; +import com.notzippy.intellij.go.intellij.runconfig.application.GoApplicationConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.application.GoApplicationRunningState; +import com.notzippy.intellij.go.intellij.util.GoHistoryProcessListener; import com.intellij.execution.ExecutionException; import com.intellij.execution.ExecutionResult; import com.intellij.execution.RunProfileStarter; @@ -36,7 +36,6 @@ import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.RunContentBuilder; import com.intellij.execution.ui.RunContentDescriptor; -import com.intellij.internal.statistic.UsageTrigger; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -190,7 +189,7 @@ public RunContentDescriptor execute(@NotNull RunProfileState state, @NotNull Exe throw new ExecutionException("Cannot run debugger"); } - UsageTrigger.trigger("go.dlv.debugger"); + return XDebuggerManager.getInstance(env.getProject()).startSession(env, new XDebugProcessStarter() { @NotNull diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoConfigurationFactoryBase.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoConfigurationFactoryBase.java index b79638dd57..7bea231b7b 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoConfigurationFactoryBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoConfigurationFactoryBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; import com.intellij.compiler.options.CompileStepBeforeRun; import com.intellij.execution.BeforeRunTask; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoConsoleFilter.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoConsoleFilter.java index 66ee6711f0..b3b94e51cd 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoConsoleFilter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoConsoleFilter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; -import com.goide.codeInsight.imports.GoGetPackageFix; -import com.goide.sdk.GoPackageUtil; -import com.goide.util.GoPathResolveScope; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.codeInsight.imports.GoGetPackageFix; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.util.GoPathResolveScope; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.execution.filters.Filter; import com.intellij.execution.filters.HyperlinkInfo; import com.intellij.execution.filters.OpenFileHyperlinkInfo; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoModuleBasedConfiguration.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoModuleBasedConfiguration.java index df06434ab9..401fc61fce 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoModuleBasedConfiguration.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoModuleBasedConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; import com.intellij.execution.configurations.RunConfigurationModule; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationBase.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationBase.java index 951a59b407..a444a02042 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationBase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; -import com.goide.sdk.GoSdkService; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.ExecutionException; import com.intellij.execution.Executor; @@ -44,7 +44,7 @@ import java.util.Map; public abstract class GoRunConfigurationBase - extends ModuleBasedConfiguration implements RunConfigurationWithSuppressedDefaultRunAction, + extends ModuleBasedConfiguration implements RunConfigurationWithSuppressedDefaultRunAction, RunConfigurationWithSuppressedDefaultDebugAction { private static final String WORKING_DIRECTORY_NAME = "working_directory"; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationProducerBase.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationProducerBase.java index 7c0889f126..f8fefc8c9e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationProducerBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationProducerBase.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; -import com.goide.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFile; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.actions.RunConfigurationProducer; import com.intellij.execution.configurations.ConfigurationType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationWithMain.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationWithMain.java index ebacecaa14..6ed3a9f260 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationWithMain.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationWithMain.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; -import com.goide.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFile; import com.intellij.execution.configurations.ConfigurationFactory; import com.intellij.execution.configurations.RuntimeConfigurationError; import com.intellij.execution.configurations.RuntimeConfigurationException; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunLineMarkerProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunLineMarkerProvider.java index 1437445dac..e806b088db 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunLineMarkerProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunLineMarkerProvider.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; -import com.goide.GoConstants; -import com.goide.GoTypes; -import com.goide.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; import com.intellij.execution.lineMarker.ExecutorAction; import com.intellij.execution.lineMarker.RunLineMarkerContributor; import com.intellij.icons.AllIcons; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunUtil.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunUtil.java index 48730605ae..a7c57c1e43 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunUtil.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; -import com.goide.GoConstants; -import com.goide.GoFileType; -import com.goide.psi.GoFile; -import com.goide.psi.GoPackageClause; -import com.goide.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoPackageClause; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.process.ProcessHandler; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunner.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunner.java index b2381cb869..8783ec7870 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunner.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.executors.DefaultRunExecutor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunningState.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunningState.java index b9185fa020..4e6a6f5225 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunningState.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/GoRunningState.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.CommandLineState; import com.intellij.execution.configurations.GeneralCommandLine; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationConfiguration.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationConfiguration.java index dcc5195957..508ae43e7b 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationConfiguration.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.runconfig.application; +package com.notzippy.intellij.go.intellij.runconfig.application; -import com.goide.runconfig.GoModuleBasedConfiguration; -import com.goide.runconfig.GoRunConfigurationWithMain; -import com.goide.runconfig.GoRunUtil; -import com.goide.runconfig.ui.GoApplicationConfigurationEditorForm; -import com.goide.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.runconfig.GoModuleBasedConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationWithMain; +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; +import com.notzippy.intellij.go.intellij.runconfig.ui.GoApplicationConfigurationEditorForm; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; import com.intellij.execution.configurations.*; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunConfigurationProducer.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunConfigurationProducer.java index f436f458fc..bba99c7e28 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunConfigurationProducer.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunConfigurationProducer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.runconfig.application; +package com.notzippy.intellij.go.intellij.runconfig.application; -import com.goide.psi.GoFile; -import com.goide.runconfig.GoRunConfigurationProducerBase; -import com.goide.runconfig.GoRunUtil; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationProducerBase; +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunConfigurationType.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunConfigurationType.java index c3eed790e2..92441a193a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunConfigurationType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunConfigurationType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.runconfig.application; +package com.notzippy.intellij.go.intellij.runconfig.application; -import com.goide.GoConstants; -import com.goide.GoIcons; -import com.goide.runconfig.GoConfigurationFactoryBase; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoIcons; +import com.notzippy.intellij.go.intellij.runconfig.GoConfigurationFactoryBase; import com.intellij.execution.configurations.ConfigurationTypeBase; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.extensions.Extensions; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunningState.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunningState.java index 429bedbf94..37952de1c3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunningState.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoApplicationRunningState.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.runconfig.application; +package com.notzippy.intellij.go.intellij.runconfig.application; -import com.goide.GoConstants; -import com.goide.runconfig.GoRunningState; -import com.goide.util.GoExecutor; -import com.goide.util.GoHistoryProcessListener; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.runconfig.GoRunningState; +import com.notzippy.intellij.go.intellij.util.GoExecutor; +import com.notzippy.intellij.go.intellij.util.GoHistoryProcessListener; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.execution.ExecutionException; import com.intellij.execution.executors.DefaultDebugExecutor; import com.intellij.execution.process.ProcessAdapter; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoNopProcessHandler.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoNopProcessHandler.java index 92408927fd..468e951ba3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoNopProcessHandler.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/application/GoNopProcessHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig.application; +package com.notzippy.intellij.go.intellij.runconfig.application; import com.intellij.execution.process.ProcessHandler; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoBeforeRunTaskProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoBeforeRunTaskProvider.java index 7467fd4f89..c55069e7e5 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoBeforeRunTaskProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoBeforeRunTaskProvider.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.runconfig.before; +package com.notzippy.intellij.go.intellij.runconfig.before; -import com.goide.GoIcons; -import com.goide.runconfig.GoRunConfigurationBase; -import com.goide.sdk.GoSdkService; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.GoIcons; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationBase; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.execution.BeforeRunTaskProvider; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.process.ProcessAdapter; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoCommandBeforeRunTask.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoCommandBeforeRunTask.java index 36b4f3094f..5341822710 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoCommandBeforeRunTask.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoCommandBeforeRunTask.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig.before; +package com.notzippy.intellij.go.intellij.runconfig.before; import com.intellij.execution.BeforeRunTask; import com.intellij.openapi.util.text.StringUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoCommandConfigureDialog.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoCommandConfigureDialog.java index dab5c1fb17..7adac986c2 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoCommandConfigureDialog.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/before/GoCommandConfigureDialog.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig.before; +package com.notzippy.intellij.go.intellij.runconfig.before; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfiguration.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfiguration.java index 14ee1327f0..691ec4bc36 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfiguration.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfiguration.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.runconfig.file; +package com.notzippy.intellij.go.intellij.runconfig.file; -import com.goide.runconfig.GoModuleBasedConfiguration; -import com.goide.runconfig.GoRunConfigurationWithMain; -import com.goide.runconfig.ui.GoRunFileConfigurationEditorForm; +import com.notzippy.intellij.go.intellij.runconfig.GoModuleBasedConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationWithMain; +import com.notzippy.intellij.go.intellij.runconfig.ui.GoRunFileConfigurationEditorForm; import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.ModuleBasedConfiguration; import com.intellij.execution.configurations.RunConfiguration; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfigurationProducer.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfigurationProducer.java index 13e86b3d76..2e782308f1 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfigurationProducer.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfigurationProducer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.file; +package com.notzippy.intellij.go.intellij.runconfig.file; -import com.goide.runconfig.GoRunConfigurationProducerBase; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationProducerBase; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfigurationType.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfigurationType.java index b890f47f1d..fc6d6cc9ee 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfigurationType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileConfigurationType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.runconfig.file; +package com.notzippy.intellij.go.intellij.runconfig.file; -import com.goide.GoConstants; -import com.goide.GoIcons; -import com.goide.runconfig.GoConfigurationFactoryBase; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoIcons; +import com.notzippy.intellij.go.intellij.runconfig.GoConfigurationFactoryBase; import com.intellij.execution.configurations.ConfigurationTypeBase; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.extensions.Extensions; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileRunningState.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileRunningState.java index c675ccbe02..a7c17501c6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileRunningState.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/file/GoRunFileRunningState.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.file; +package com.notzippy.intellij.go.intellij.runconfig.file; -import com.goide.runconfig.GoRunningState; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.intellij.runconfig.GoRunningState; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.execution.ExecutionException; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestConfigurationFactoryBase.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestConfigurationFactoryBase.java index 884d7f9384..ea263e10ec 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestConfigurationFactoryBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestConfigurationFactoryBase.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.runconfig.GoConfigurationFactoryBase; -import com.goide.runconfig.before.GoBeforeRunTaskProvider; -import com.goide.runconfig.before.GoCommandBeforeRunTask; +import com.notzippy.intellij.go.intellij.runconfig.GoConfigurationFactoryBase; +import com.notzippy.intellij.go.intellij.runconfig.before.GoBeforeRunTaskProvider; +import com.notzippy.intellij.go.intellij.runconfig.before.GoCommandBeforeRunTask; import com.intellij.execution.BeforeRunTask; import com.intellij.execution.configurations.ConfigurationTypeBase; import com.intellij.openapi.util.Key; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestConsoleProperties.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestConsoleProperties.java index 59f408821e..46c1e594ab 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestConsoleProperties.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestConsoleProperties.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.runconfig.GoRunConfigurationBase; -import com.goide.sdk.GoPackageUtil; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationBase; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.execution.ExecutionException; import com.intellij.execution.Executor; import com.intellij.execution.Location; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestEventsConverterBase.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestEventsConverterBase.java index d3117e03d3..cf916abaef 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestEventsConverterBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestEventsConverterBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; import com.intellij.openapi.util.Key; import jetbrains.buildServer.messages.serviceMessages.ServiceMessageVisitor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFinder.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFinder.java index e2bcc87a74..b603d3d499 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFinder.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFinder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.GoConstants; -import com.goide.GoFileType; -import com.goide.psi.GoFile; -import com.goide.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFramework.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFramework.java index 54dc1ee160..d86ffd41e2 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFramework.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFramework.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.runconfig.testing.frameworks.gobench.GobenchFramework; -import com.goide.runconfig.testing.frameworks.gocheck.GocheckFramework; -import com.goide.runconfig.testing.frameworks.gotest.GotestFramework; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gobench.GobenchFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gocheck.GocheckFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GotestFramework; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.execution.testframework.sm.runner.OutputToGeneralTestEventsConverter; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFunctionType.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFunctionType.java index d54c8eaaca..34b1588a65 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFunctionType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestFunctionType.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.GoConstants; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestLocator.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestLocator.java index b743b512d3..e9118dfbbe 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestLocator.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestLocator.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.psi.GoMethodDeclaration; -import com.goide.psi.GoTypeSpec; -import com.goide.stubs.index.GoFunctionIndex; -import com.goide.stubs.index.GoIdFilter; -import com.goide.stubs.index.GoTypesIndex; +import com.notzippy.intellij.go.grammar.psi.GoMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; +import com.notzippy.intellij.go.stubs.index.GoFunctionIndex; +import com.notzippy.intellij.go.stubs.index.GoIdFilter; +import com.notzippy.intellij.go.stubs.index.GoTypesIndex; import com.intellij.execution.Location; import com.intellij.execution.PsiLocation; import com.intellij.execution.testframework.sm.runner.SMTestLocator; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfiguration.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfiguration.java index 0c8a0d78e7..ac8ab21f86 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfiguration.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.runconfig.GoModuleBasedConfiguration; -import com.goide.runconfig.GoRunConfigurationBase; -import com.goide.runconfig.testing.frameworks.gotest.GotestFramework; -import com.goide.runconfig.testing.ui.GoTestRunConfigurationEditorForm; -import com.goide.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.runconfig.GoModuleBasedConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationBase; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GotestFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.ui.GoTestRunConfigurationEditorForm; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; import com.intellij.execution.configurations.*; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.testframework.TestConsoleProperties; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationProducerBase.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationProducerBase.java index 73deaaa9ca..40a1cf3cd1 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationProducerBase.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationProducerBase.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.runconfig.testing; - -import com.goide.psi.GoFile; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.GoMethodDeclaration; -import com.goide.runconfig.GoRunUtil; -import com.goide.sdk.GoSdkService; +package com.notzippy.intellij.go.intellij.runconfig.testing; + +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoMethodDeclaration; +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.actions.RunConfigurationProducer; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationType.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationType.java index 466beb91a3..b07631ca80 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationType.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.GoIcons; +import com.notzippy.intellij.go.intellij.GoIcons; import com.intellij.execution.configurations.ConfigurationTypeBase; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.extensions.Extensions; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunLineMarkerProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunLineMarkerProvider.java index 34512b0cbd..4cc0a71e84 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunLineMarkerProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunLineMarkerProvider.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.GoTypes; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.GoMethodDeclaration; -import com.goide.psi.GoReceiver; -import com.goide.runconfig.GoRunUtil; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoReceiver; +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; import com.intellij.execution.TestStateStorage; import com.intellij.execution.lineMarker.ExecutorAction; import com.intellij.execution.lineMarker.RunLineMarkerContributor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunningState.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunningState.java index 37d3d3b2d4..12b00f4fc8 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunningState.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunningState.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.psi.GoFile; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.runconfig.GoConsoleFilter; -import com.goide.runconfig.GoRunningState; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.intellij.runconfig.GoConsoleFilter; +import com.notzippy.intellij.go.intellij.runconfig.GoRunningState; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.execution.DefaultExecutionResult; import com.intellij.execution.ExecutionException; import com.intellij.execution.ExecutionResult; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageAnnotator.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageAnnotator.java index d3247856e0..927deeefa0 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageAnnotator.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageAnnotator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig.testing.coverage; +package com.notzippy.intellij.go.intellij.runconfig.testing.coverage; import com.intellij.coverage.BaseCoverageAnnotator; import com.intellij.coverage.CoverageDataManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageEnabledConfiguration.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageEnabledConfiguration.java index e66f0b3e92..4f4cb2ef04 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageEnabledConfiguration.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageEnabledConfiguration.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing.coverage; +package com.notzippy.intellij.go.intellij.runconfig.testing.coverage; -import com.goide.runconfig.testing.GoTestRunConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfiguration; import com.intellij.coverage.CoverageRunner; import com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageEngine.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageEngine.java index 683728f965..6afd37bf39 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageEngine.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageEngine.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.runconfig.testing.coverage; +package com.notzippy.intellij.go.intellij.runconfig.testing.coverage; -import com.goide.GoFileType; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.runconfig.testing.GoTestRunConfiguration; +import com.notzippy.intellij.go.intellij.GoFileType; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfiguration; import com.intellij.coverage.*; import com.intellij.coverage.view.CoverageViewExtension; import com.intellij.coverage.view.CoverageViewManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageProgramRunner.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageProgramRunner.java index e5ea590c67..31b6008405 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageProgramRunner.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageProgramRunner.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.testing.coverage; +package com.notzippy.intellij.go.intellij.runconfig.testing.coverage; -import com.goide.runconfig.testing.GoTestRunConfiguration; -import com.goide.runconfig.testing.GoTestRunningState; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunningState; import com.intellij.coverage.CoverageExecutor; import com.intellij.coverage.CoverageHelper; import com.intellij.coverage.CoverageRunnerData; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageProjectData.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageProjectData.java index 221a009d5f..aac5f7772d 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageProjectData.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageProjectData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig.testing.coverage; +package com.notzippy.intellij.go.intellij.runconfig.testing.coverage; import com.intellij.openapi.util.Factory; import com.intellij.rt.coverage.data.CoverageData; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageRunner.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageRunner.java index 246342ff97..30382097b4 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageRunner.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageRunner.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.testing.coverage; +package com.notzippy.intellij.go.intellij.runconfig.testing.coverage; -import com.goide.GoConstants; -import com.goide.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; import com.intellij.coverage.BaseCoverageSuite; import com.intellij.coverage.CoverageEngine; import com.intellij.coverage.CoverageRunner; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageSuite.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageSuite.java index c323ca2a49..766dcab7a3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageSuite.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/coverage/GoCoverageSuite.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig.testing.coverage; +package com.notzippy.intellij.go.intellij.runconfig.testing.coverage; import com.intellij.coverage.BaseCoverageSuite; import com.intellij.coverage.CoverageEngine; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchEventsConverter.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchEventsConverter.java index 8f7614e558..8f50ec48d7 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchEventsConverter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchEventsConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gobench; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gobench; -import com.goide.GoConstants; -import com.goide.runconfig.testing.frameworks.gotest.GoTestEventsConverterBaseImpl; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GoTestEventsConverterBaseImpl; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.text.StringUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchFramework.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchFramework.java index 67b2c7b583..b5b7e7e91f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchFramework.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchFramework.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gobench; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gobench; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.runconfig.testing.GoTestFramework; -import com.goide.runconfig.testing.GoTestRunConfiguration; -import com.goide.runconfig.testing.GoTestRunningState; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunningState; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.execution.testframework.sm.runner.OutputToGeneralTestEventsConverter; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchRunConfigurationProducer.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchRunConfigurationProducer.java index 42131554b6..9ba977bd3a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchRunConfigurationProducer.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchRunConfigurationProducer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gobench; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gobench; -import com.goide.runconfig.testing.GoTestRunConfigurationProducerBase; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfigurationProducerBase; import org.jetbrains.annotations.NotNull; public class GobenchRunConfigurationProducer extends GoTestRunConfigurationProducerBase implements Cloneable { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchRunningState.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchRunningState.java index c6538ad8d5..ca5e7c0f7e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchRunningState.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gobench/GobenchRunningState.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gobench; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gobench; -import com.goide.psi.GoFile; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.runconfig.testing.GoTestRunConfiguration; -import com.goide.runconfig.testing.GoTestRunningState; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunningState; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.module.Module; import com.intellij.openapi.util.text.StringUtil; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckEventsConverter.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckEventsConverter.java index f3c293e473..70c9bec07a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckEventsConverter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckEventsConverter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gocheck; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gocheck; -import com.goide.runconfig.testing.GoTestEventsConverterBase; -import com.goide.runconfig.testing.GoTestLocator; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestEventsConverterBase; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestLocator; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.execution.testframework.sm.ServiceMessageBuilder; import com.intellij.execution.testframework.sm.runner.OutputToGeneralTestEventsConverter; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckFramework.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckFramework.java index 55c136ed67..42b7c95df5 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckFramework.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckFramework.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gocheck; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gocheck; -import com.goide.psi.GoFile; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.GoMethodDeclaration; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.runconfig.testing.*; -import com.goide.stubs.index.GoPackagesIndex; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.runconfig.testing.*; +import com.notzippy.intellij.go.stubs.index.GoPackagesIndex; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.execution.testframework.sm.runner.OutputToGeneralTestEventsConverter; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckRunConfigurationProducer.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckRunConfigurationProducer.java index 1ff01be17e..286159ea05 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckRunConfigurationProducer.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckRunConfigurationProducer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gocheck; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gocheck; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.GoMethodDeclaration; -import com.goide.runconfig.testing.GoTestRunConfigurationProducerBase; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoMethodDeclaration; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfigurationProducerBase; import org.jetbrains.annotations.NotNull; public class GocheckRunConfigurationProducer extends GoTestRunConfigurationProducerBase implements Cloneable { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckRunningState.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckRunningState.java index e3dc33b250..79a1d7bf6f 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckRunningState.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gocheck/GocheckRunningState.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gocheck; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gocheck; -import com.goide.psi.GoFile; -import com.goide.psi.GoMethodDeclaration; -import com.goide.runconfig.testing.GoTestRunConfiguration; -import com.goide.runconfig.testing.GoTestRunningState; -import com.goide.util.GoExecutor; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoMethodDeclaration; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunningState; +import com.notzippy.intellij.go.intellij.util.GoExecutor; import com.intellij.execution.ExecutionException; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GoTestEventsConverterBaseImpl.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GoTestEventsConverterBaseImpl.java index ce5e570a40..2fa4370775 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GoTestEventsConverterBaseImpl.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GoTestEventsConverterBaseImpl.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gotest; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest; -import com.goide.runconfig.testing.GoTestEventsConverterBase; -import com.goide.runconfig.testing.GoTestLocator; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestEventsConverterBase; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestLocator; import com.intellij.execution.process.ProcessOutputTypes; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.execution.testframework.sm.ServiceMessageBuilder; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestEventsConverter.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestEventsConverter.java index e845fececc..88b3216633 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestEventsConverter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestEventsConverter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gotest; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest; -import com.goide.GoConstants; +import com.notzippy.intellij.go.intellij.GoConstants; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.openapi.util.Key; import jetbrains.buildServer.messages.serviceMessages.ServiceMessageVisitor; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestFramework.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestFramework.java index 27971ba3bc..f7fad36839 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestFramework.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestFramework.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gotest; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.runconfig.testing.*; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.intellij.runconfig.testing.*; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.execution.testframework.sm.runner.OutputToGeneralTestEventsConverter; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestGenerateAction.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestGenerateAction.java index 163bde0d7f..2ac71b4314 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestGenerateAction.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestGenerateAction.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gotest; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest; -import com.goide.GoConstants; -import com.goide.generate.GoGenerateTestActionBase; -import com.goide.psi.GoFile; -import com.goide.psi.GoImportSpec; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.runconfig.testing.GoTestFunctionType; -import com.goide.template.GoLiveTemplateContextType; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.generate.GoGenerateTestActionBase; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFunctionType; +import com.notzippy.intellij.go.intellij.template.GoLiveTemplateContextType; import com.intellij.codeInsight.AutoPopupController; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.template.TemplateContextType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestRunConfigurationProducer.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestRunConfigurationProducer.java index c52b6f7429..12a9bfa3ff 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestRunConfigurationProducer.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/frameworks/gotest/GotestRunConfigurationProducer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing.frameworks.gotest; +package com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest; -import com.goide.runconfig.testing.GoTestRunConfigurationProducerBase; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfigurationProducerBase; public class GotestRunConfigurationProducer extends GoTestRunConfigurationProducerBase implements Cloneable { public GotestRunConfigurationProducer() { diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/ui/GoPackageFieldCompletionProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/ui/GoPackageFieldCompletionProvider.java index 520626591e..ec9d607103 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/ui/GoPackageFieldCompletionProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/ui/GoPackageFieldCompletionProvider.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.testing.ui; +package com.notzippy.intellij.go.intellij.runconfig.testing.ui; -import com.goide.completion.GoImportPathsCompletionProvider; -import com.goide.util.GoUtil; +import com.notzippy.intellij.go.intellij.completion.GoImportPathsCompletionProvider; +import com.notzippy.intellij.go.intellij.util.GoUtil; import com.intellij.codeInsight.completion.CompletionResultSet; import com.intellij.openapi.module.Module; import com.intellij.psi.search.GlobalSearchScope; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/ui/GoTestRunConfigurationEditorForm.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/ui/GoTestRunConfigurationEditorForm.java index 26c4742433..0dcf0106e0 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/ui/GoTestRunConfigurationEditorForm.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/testing/ui/GoTestRunConfigurationEditorForm.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.runconfig.testing.ui; - -import com.goide.runconfig.GoRunUtil; -import com.goide.runconfig.testing.GoTestRunConfiguration; -import com.goide.runconfig.testing.frameworks.gobench.GobenchFramework; -import com.goide.runconfig.testing.frameworks.gocheck.GocheckFramework; -import com.goide.runconfig.testing.frameworks.gotest.GotestFramework; -import com.goide.runconfig.ui.GoCommonSettingsPanel; +package com.notzippy.intellij.go.intellij.runconfig.testing.ui; + +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestRunConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gobench.GobenchFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gocheck.GocheckFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GotestFramework; +import com.notzippy.intellij.go.intellij.runconfig.ui.GoCommonSettingsPanel; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoApplicationConfigurationEditorForm.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoApplicationConfigurationEditorForm.java index be48ee9ae9..af31e37631 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoApplicationConfigurationEditorForm.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoApplicationConfigurationEditorForm.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.runconfig.ui; +package com.notzippy.intellij.go.intellij.runconfig.ui; -import com.goide.runconfig.GoRunUtil; -import com.goide.runconfig.application.GoApplicationConfiguration; -import com.goide.runconfig.testing.ui.GoPackageFieldCompletionProvider; +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; +import com.notzippy.intellij.go.intellij.runconfig.application.GoApplicationConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.testing.ui.GoPackageFieldCompletionProvider; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoCommonSettingsPanel.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoCommonSettingsPanel.java index 809343c220..3662573b94 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoCommonSettingsPanel.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoCommonSettingsPanel.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.ui; +package com.notzippy.intellij.go.intellij.runconfig.ui; -import com.goide.runconfig.GoRunConfigurationBase; -import com.goide.runconfig.GoRunUtil; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationBase; +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; import com.intellij.application.options.ModulesComboBox; import com.intellij.execution.configuration.EnvironmentVariablesTextFieldWithBrowseButton; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoRunFileConfigurationEditorForm.java b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoRunFileConfigurationEditorForm.java index e219fc33df..6955c8eb4c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoRunFileConfigurationEditorForm.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/runconfig/ui/GoRunFileConfigurationEditorForm.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig.ui; +package com.notzippy.intellij.go.intellij.runconfig.ui; -import com.goide.runconfig.GoRunUtil; -import com.goide.runconfig.file.GoRunFileConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; +import com.notzippy.intellij.go.intellij.runconfig.file.GoRunFileConfiguration; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoEnvironmentGoPathModificationTracker.java b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoEnvironmentGoPathModificationTracker.java index 0e54a68307..207148e730 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoEnvironmentGoPathModificationTracker.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoEnvironmentGoPathModificationTracker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.sdk; +package com.notzippy.intellij.go.intellij.sdk; -import com.goide.GoEnvironmentUtil; +import com.notzippy.intellij.go.goide.GoEnvironmentUtil; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.*; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoIdeaSdkService.java b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoIdeaSdkService.java index 27202f06c5..0a808e3361 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoIdeaSdkService.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoIdeaSdkService.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.sdk; +package com.notzippy.intellij.go.intellij.sdk; -import com.goide.GoModuleType; +import com.notzippy.intellij.go.intellij.GoModuleType; import com.intellij.ProjectTopics; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ComponentManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoPackageUtil.java b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoPackageUtil.java index a4bf3b955d..09eb6b986d 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoPackageUtil.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoPackageUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.sdk; +package com.notzippy.intellij.go.intellij.sdk; -import com.goide.GoConstants; -import com.goide.project.GoBuildTargetSettings; -import com.goide.project.GoModuleSettings; -import com.goide.psi.GoFile; -import com.goide.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.project.GoBuildTargetSettings; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkLibraryPresentationProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkLibraryPresentationProvider.java index bc2fa11839..5f9a2b5360 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkLibraryPresentationProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkLibraryPresentationProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.sdk; +package com.notzippy.intellij.go.intellij.sdk; -import com.goide.GoIcons; +import com.notzippy.intellij.go.intellij.GoIcons; import com.intellij.openapi.roots.libraries.DummyLibraryProperties; import com.intellij.openapi.roots.libraries.LibraryKind; import com.intellij.openapi.roots.libraries.LibraryPresentationProvider; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkService.java b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkService.java index d2c87be00c..8be4f3bc1e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkService.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.sdk; +package com.notzippy.intellij.go.intellij.sdk; -import com.goide.GoConstants; -import com.goide.GoEnvironmentUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.goide.GoEnvironmentUtil; import com.intellij.execution.configurations.PathEnvironmentVariableUtil; import com.intellij.openapi.Disposable; import com.intellij.openapi.components.ServiceManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkType.java b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkType.java index 24798c3ea8..c00d0f688a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkType.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.sdk; +package com.notzippy.intellij.go.intellij.sdk; -import com.goide.GoConstants; -import com.goide.GoIcons; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.GoIcons; import com.intellij.openapi.projectRoots.*; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.vfs.VirtualFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkUtil.java b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkUtil.java index 155714a45a..b4461acca2 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkUtil.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSdkUtil.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.sdk; - -import com.goide.GoConstants; -import com.goide.GoEnvironmentUtil; -import com.goide.appengine.YamlFilesModificationTracker; -import com.goide.project.GoApplicationLibrariesService; -import com.goide.project.GoLibrariesService; -import com.goide.psi.GoFile; +package com.notzippy.intellij.go.intellij.sdk; + +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.goide.GoEnvironmentUtil; +import com.notzippy.intellij.go.intellij.appengine.YamlFilesModificationTracker; +import com.notzippy.intellij.go.intellij.project.GoApplicationLibrariesService; +import com.notzippy.intellij.go.intellij.project.GoLibrariesService; +import com.notzippy.intellij.go.grammar.psi.GoFile; import com.intellij.execution.configurations.PathEnvironmentVariableUtil; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; @@ -56,6 +56,7 @@ import static com.intellij.util.containers.ContainerUtil.newLinkedHashSet; public class GoSdkUtil { + private static final Pattern GO_SDK_PATTERN = Pattern.compile("([0-9]+)\\.+([0-9]+).*"); private static final Pattern GO_VERSION_PATTERN = Pattern.compile("[tT]heVersion\\s*=\\s*`go([\\d.]+\\w+(\\d+)?)`"); private static final Pattern GAE_VERSION_PATTERN = Pattern.compile("[tT]heVersion\\s*=\\s*`go([\\d.]+)( \\(appengine-[\\d.]+\\))?`"); private static final Pattern GO_DEVEL_VERSION_PATTERN = Pattern.compile("[tT]heVersion\\s*=\\s*`(devel.*)`"); @@ -197,19 +198,18 @@ public static Collection getGoPathSources(@NotNull Project project, GoSdkService sdkService = GoSdkService.getInstance(project1); if (sdkService.isAppEngineSdk(module)) { ContainerUtil.addAllNotNull(result, ContainerUtil.mapNotNull(YamlFilesModificationTracker.getYamlFiles(project1, module), - VirtualFile::getParent)); + VirtualFile::getParent)); } result.addAll(getInnerGoPathSources(project1, module)); return CachedValueProvider.Result - .create(result, getSdkAndLibrariesCacheDependencies(project1, module, YamlFilesModificationTracker.getInstance(project1))); + .create(result, getSdkAndLibrariesCacheDependencies(project1, module, YamlFilesModificationTracker.getInstance(project1))); }); } return CachedValuesManager.getManager(project).getCachedValue(project, - (CachedValueProvider>)() -> CachedValueProvider.Result - .create(getInnerGoPathSources(project, null), - getSdkAndLibrariesCacheDependencies(project, null, YamlFilesModificationTracker.getInstance(project)))); + (CachedValueProvider>)() -> CachedValueProvider.Result + .create(getInnerGoPathSources(project, null), + getSdkAndLibrariesCacheDependencies(project, null, YamlFilesModificationTracker.getInstance(project)))); } - @NotNull private static List getInnerGoPathSources(@NotNull Project project, @Nullable Module module) { return ContainerUtil.mapNotNull(getGoPathRoots(project, module), new RetrieveSubDirectoryOrSelfFunction("src")); @@ -255,7 +255,17 @@ private static String getSrcLocation(@NotNull String version) { if (version.startsWith("devel")) { return "src"; } - if (version.length() > 2 && StringUtil.parseDouble(version.substring(0, 3), 1.4) < 1.4) { + // Capture up until the next index + Matcher matcher = GO_SDK_PATTERN.matcher(version); + if (matcher.find()) { + double major = StringUtil.parseDouble(matcher.group(1), 1); + double minor = StringUtil.parseDouble(matcher.group(2), 4); + if ( major == 1 && minor < 4) { + return "src/pkg"; + } else { + return "src"; + } + }else if (version.length() > 2 && StringUtil.parseDouble(version.substring(0, 3), 1.4) < 1.4) { return "src/pkg"; } return "src"; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSmallIDEsSdkService.java b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSmallIDEsSdkService.java index bfae0f6b88..ee5f1b3bd6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSmallIDEsSdkService.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/sdk/GoSmallIDEsSdkService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.sdk; +package com.notzippy.intellij.go.intellij.sdk; -import com.goide.GoConstants; -import com.goide.configuration.GoSdkConfigurable; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.configuration.GoSdkConfigurable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ComponentManager; import com.intellij.openapi.module.Module; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/template/GoEverywhereContextType.java b/src/main/java/com/notzippy/intellij/go/intellij/template/GoEverywhereContextType.java index 9c3cb38b34..381e3c6712 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/template/GoEverywhereContextType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/template/GoEverywhereContextType.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.template; +package com.notzippy.intellij.go.intellij.template; -import com.goide.GoConstants; -import com.goide.GoTypes; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.parser.GoTypes; import com.intellij.codeInsight.template.EverywhereContextType; import com.intellij.psi.PsiComment; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/template/GoFieldNameMacro.java b/src/main/java/com/notzippy/intellij/go/intellij/template/GoFieldNameMacro.java index 05f90c56a0..cd23eb6ae5 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/template/GoFieldNameMacro.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/template/GoFieldNameMacro.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.template; +package com.notzippy.intellij.go.intellij.template; -import com.goide.psi.GoFieldDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoFieldDeclaration; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.codeInsight.template.*; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/template/GoLiveTemplateContextType.java b/src/main/java/com/notzippy/intellij/go/intellij/template/GoLiveTemplateContextType.java index 9ad6823246..bce1f8e02e 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/template/GoLiveTemplateContextType.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/template/GoLiveTemplateContextType.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.template; +package com.notzippy.intellij.go.intellij.template; -import com.goide.GoLanguage; -import com.goide.GoTypes; -import com.goide.highlighting.GoSyntaxHighlighter; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.GoLanguage; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.intellij.highlighting.GoSyntaxHighlighter; import com.intellij.codeInsight.template.TemplateContextType; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.psi.*; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/template/GoLiveTemplatesProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/template/GoLiveTemplatesProvider.java index 23d684019f..736d21a7c6 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/template/GoLiveTemplatesProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/template/GoLiveTemplatesProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.template; +package com.notzippy.intellij.go.intellij.template; import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/tree/ExportabilityComparator.java b/src/main/java/com/notzippy/intellij/go/intellij/tree/ExportabilityComparator.java index b70484375d..70b4c29fdb 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/tree/ExportabilityComparator.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/tree/ExportabilityComparator.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.tree; +package com.notzippy.intellij.go.intellij.tree; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/tree/ExportabilitySorter.java b/src/main/java/com/notzippy/intellij/go/intellij/tree/ExportabilitySorter.java index 4460bcfe62..ff0bcb9ed5 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/tree/ExportabilitySorter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/tree/ExportabilitySorter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.tree; +package com.notzippy.intellij.go.intellij.tree; import com.intellij.icons.AllIcons; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/tree/GoPrivateMembersFilter.java b/src/main/java/com/notzippy/intellij/go/intellij/tree/GoPrivateMembersFilter.java index f0b28937b4..3e4e058fca 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/tree/GoPrivateMembersFilter.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/tree/GoPrivateMembersFilter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.tree; +package com.notzippy.intellij.go.intellij.tree; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; import com.intellij.ide.util.treeView.smartTree.ActionPresentationData; import com.intellij.ide.util.treeView.smartTree.Filter; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/tree/GoStructureViewFactory.java b/src/main/java/com/notzippy/intellij/go/intellij/tree/GoStructureViewFactory.java index d4a0a7215f..716b2b9b70 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/tree/GoStructureViewFactory.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/tree/GoStructureViewFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.tree; +package com.notzippy.intellij.go.intellij.tree; -import com.goide.GoIcons; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.sdk.GoPackageUtil; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.intellij.GoIcons; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; import com.intellij.ide.structureView.*; import com.intellij.ide.structureView.impl.common.PsiTreeElementBase; import com.intellij.ide.util.ActionShortcutProvider; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/ui/ProjectTutorialNotification.java b/src/main/java/com/notzippy/intellij/go/intellij/ui/ProjectTutorialNotification.java index 704e856f41..45f9537368 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/ui/ProjectTutorialNotification.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/ui/ProjectTutorialNotification.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.ui; +package com.notzippy.intellij.go.intellij.ui; -import com.goide.GoConstants; +import com.notzippy.intellij.go.intellij.GoConstants; import com.intellij.ide.util.PropertiesComponent; import com.intellij.notification.NotificationListener; import com.intellij.notification.NotificationType; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/usages/GoFileStructureGroupRuleProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/usages/GoFileStructureGroupRuleProvider.java index d725e9001e..e579003790 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/usages/GoFileStructureGroupRuleProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/usages/GoFileStructureGroupRuleProvider.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.usages; +package com.notzippy.intellij.go.intellij.usages; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.GoNamedElement; -import com.goide.psi.GoTypeSpec; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; @@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable; public class GoFileStructureGroupRuleProvider implements FileStructureGroupRuleProvider { + public static final SingleParentUsageGroupingRule USAGE_GROUPING_RULE = new GoClassGroupingRule(); public UsageGroupingRule getUsageGroupingRule(Project project) { return new GoClassGroupingRule(); } diff --git a/src/main/java/com/notzippy/intellij/go/intellij/usages/GoFindUsagesProvider.java b/src/main/java/com/notzippy/intellij/go/intellij/usages/GoFindUsagesProvider.java index aac5c6fe62..bb2f05facf 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/usages/GoFindUsagesProvider.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/usages/GoFindUsagesProvider.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.usages; +package com.notzippy.intellij.go.intellij.usages; -import com.goide.GoParserDefinition; -import com.goide.GoTypes; -import com.goide.lexer.GoLexer; -import com.goide.psi.*; +import com.notzippy.intellij.go.intellij.GoParserDefinition; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.lexer.GoLexer; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.lang.HelpID; import com.intellij.lang.cacheBuilder.DefaultWordsScanner; import com.intellij.lang.cacheBuilder.WordsScanner; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/usages/GoReadWriteAccessDetector.java b/src/main/java/com/notzippy/intellij/go/intellij/usages/GoReadWriteAccessDetector.java index 0913de3c6b..f0651e0ee7 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/usages/GoReadWriteAccessDetector.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/usages/GoReadWriteAccessDetector.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.usages; +package com.notzippy.intellij.go.intellij.usages; -import com.goide.psi.*; +import com.notzippy.intellij.go.grammar.psi.*; import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/util/GoBuildMatcher.java b/src/main/java/com/notzippy/intellij/go/intellij/util/GoBuildMatcher.java index 179e0e9fb2..2e0dcd2be8 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/util/GoBuildMatcher.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/util/GoBuildMatcher.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; -import com.goide.GoConstants; -import com.goide.psi.GoFile; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/util/GoExecutor.java b/src/main/java/com/notzippy/intellij/go/intellij/util/GoExecutor.java index 77414d39aa..8d6017209a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/util/GoExecutor.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/util/GoExecutor.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.util; - -import com.goide.GoConstants; -import com.goide.project.GoModuleSettings; -import com.goide.runconfig.GoConsoleFilter; -import com.goide.runconfig.GoRunUtil; -import com.goide.sdk.GoSdkService; -import com.goide.sdk.GoSdkUtil; +package com.notzippy.intellij.go.intellij.util; + +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.runconfig.GoConsoleFilter; +import com.notzippy.intellij.go.intellij.runconfig.GoRunUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.execution.ExecutionException; import com.intellij.execution.ExecutionHelper; import com.intellij.execution.ExecutionModes; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/util/GoHistoryProcessListener.java b/src/main/java/com/notzippy/intellij/go/intellij/util/GoHistoryProcessListener.java index ee3650ddf9..2cf00295f8 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/util/GoHistoryProcessListener.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/util/GoHistoryProcessListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; import com.intellij.execution.process.ProcessAdapter; import com.intellij.execution.process.ProcessEvent; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathResolveScope.java b/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathResolveScope.java index 2a754f8fa7..ef245e2478 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathResolveScope.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathResolveScope.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathScopeHelper.java b/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathScopeHelper.java index 0140b80542..f1be422c0a 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathScopeHelper.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathScopeHelper.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; -import com.goide.GoConstants; -import com.goide.project.GoVendoringUtil; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.sdk.GoSdkService; -import com.goide.sdk.GoSdkUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.project.GoVendoringUtil; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkUtil; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathUseScope.java b/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathUseScope.java index 65aad869a5..4adf441d3c 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathUseScope.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/util/GoPathUseScope.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.goide.util; - -import com.goide.psi.GoFile; -import com.goide.psi.GoImportSpec; -import com.goide.psi.GoNamedElement; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.psi.impl.imports.GoImportReferenceSet; -import com.goide.sdk.GoPackageUtil; -import com.goide.sdk.GoSdkService; +package com.notzippy.intellij.go.intellij.util; + +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.grammar.psi.impl.imports.GoImportReferenceSet; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaper.java b/src/main/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaper.java index b3480b1e0b..7265ff1043 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaper.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaper.java @@ -14,299 +14,299 @@ * limitations under the License. */ -package com.goide.util; - -import com.goide.psi.GoStringLiteral; -import com.intellij.openapi.util.TextRange; -import com.intellij.psi.LiteralTextEscaper; -import org.jetbrains.annotations.NotNull; - -import java.util.Locale; - -public class GoStringLiteralEscaper extends LiteralTextEscaper { - - private int[] outSourceOffsets; - - public GoStringLiteralEscaper(@NotNull GoStringLiteral host) { - super(host); - } - - @Override - public boolean decode(@NotNull TextRange rangeInsideHost, @NotNull StringBuilder outChars) { - TextRange.assertProperRange(rangeInsideHost); - - String subText = rangeInsideHost.substring(myHost.getText()); - - if (myHost.getRawString() != null) { - outChars.append(subText); - return true; - } - - return parseStringCharacters(subText, outChars); - } - - @Override - public int getOffsetInHost(int offsetInDecoded, @NotNull TextRange rangeInsideHost) { - TextRange.assertProperRange(rangeInsideHost); - - if (myHost.getRawString() != null) { - int offset = offsetInDecoded; - offset += rangeInsideHost.getStartOffset(); - return offset > rangeInsideHost.getEndOffset() ? -1 : offset; - } - - int result = offsetInDecoded < outSourceOffsets.length ? outSourceOffsets[offsetInDecoded] : -1; - if (result == -1) return -1; - return (result <= rangeInsideHost.getLength() ? result : rangeInsideHost.getLength()) + rangeInsideHost.getStartOffset(); - } - - /** - * Escapes the specified string in accordance with https://golang.org/ref/spec#Rune_literals - * - * @param chars - * @param outChars - */ - public static void escapeString(@NotNull String chars, @NotNull StringBuilder outChars) { - int index = 0; - - while (index < chars.length()) { - int c = chars.codePointAt(index); - - switch (c) { - case (char)7: - outChars.append("\\a"); - break; - - case '\b': - outChars.append("\\b"); - break; - - case '\f': - outChars.append("\\f"); - break; - - case '\n': - outChars.append("\\n"); - break; - - case '\r': - outChars.append("\\r"); - break; - - case '\t': - outChars.append("\\t"); - break; - - case (char)0x0b: - outChars.append("\\v"); - break; - - case '\\': - outChars.append("\\\\"); - break; - - case '\'': - outChars.append("\\'"); - break; - - case '"': - outChars.append("\\\""); - break; - - default: - switch (Character.getType(c)) { - case Character.CONTROL: - case Character.PRIVATE_USE: - case Character.UNASSIGNED: - if (c <= 0xffff) { - outChars.append("\\u").append(String.format(Locale.US, "%04X", c)); - } else { - outChars.append("\\U").append(String.format(Locale.US, "%08X", c)); - } - - break; - - default: - outChars.appendCodePoint(c); - } - } - - index += Character.charCount(c); - } - } - - private boolean parseStringCharacters(String chars, StringBuilder outChars) { - outSourceOffsets = new int[chars.length() + 1]; - outSourceOffsets[chars.length()] = -1; - - if (chars.indexOf('\\') < 0) { - outChars.append(chars); - for (int i = 0; i < outSourceOffsets.length; i++) { - outSourceOffsets[i] = i; - } - return true; - } - int index = 0; - - while (index < chars.length()) { - char c = chars.charAt(index++); - - outSourceOffsets[outChars.length()] = index - 1; - outSourceOffsets[outChars.length() + 1] = index; - - if (c != '\\') { - outChars.append(c); - continue; - } - if (index == chars.length()) return false; - c = chars.charAt(index++); - - switch (c) { - case 'a': - outChars.append((char)7); - break; - - case 'b': - outChars.append('\b'); - break; - - case 'f': - outChars.append('\f'); - break; - - case 'n': - outChars.append('\n'); - break; - - case 'r': - outChars.append('\r'); - break; - - case 't': - outChars.append('\t'); - break; - - case 'v': - outChars.append((char)0x0b); - break; - - case '\\': - outChars.append('\\'); - break; - - case '\'': - outChars.append('\''); - break; - - case '"': - outChars.append('"'); - break; - - case '\n': - outChars.append('\n'); - break; - - // octal - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': { - char startC = c; - int v = (int)c - '0'; - if (index < chars.length()) { - c = chars.charAt(index++); - if ('0' <= c && c <= '7') { - v <<= 3; - v += c - '0'; - if (startC <= '3' && index < chars.length()) { - c = chars.charAt(index++); - if ('0' <= c && c <= '7') { - v <<= 3; - v += c - '0'; - } - else { - index--; - } - } - } - else { - index--; - } - } - outChars.append((char)v); - } - break; - - // hex - case 'x': - if (index + 2 <= chars.length()) { - try { - int v = Integer.parseInt(chars.substring(index, index + 2), 16); - outChars.append((char)v); - index += 2; - } - catch (Exception e) { - return false; - } - } - else { - return false; - } - break; - - // little unicode - case 'u': - if (index + 4 <= chars.length()) { - try { - int v = Integer.parseInt(chars.substring(index, index + 4), 16); - c = chars.charAt(index); - if (c == '+' || c == '-') return false; - outChars.append((char)v); - index += 4; - } - catch (Exception e) { - return false; - } - } - else { - return false; - } - break; - - // big unicode - case 'U': - if (index + 8 <= chars.length()) { - try { - int v = Integer.parseInt(chars.substring(index, index + 8), 16); - c = chars.charAt(index); - if (c == '+' || c == '-') return false; - outChars.append((char)v); - index += 8; - } - catch (Exception e) { - return false; - } - } - else { - return false; - } - break; - - default: - return false; - } - - outSourceOffsets[outChars.length()] = index; - } - return true; - } - - @Override - public boolean isOneLine() { - return true; - } -} +package com.notzippy.intellij.go.intellij.util; + +//import com.notzippy.intellij.go.grammar.psi.GoStringLiteral; +//import com.intellij.openapi.util.TextRange; +//import com.intellij.psi.LiteralTextEscaper; +//import org.jetbrains.annotations.NotNull; +// +//import java.util.Locale; +// +//public class GoStringLiteralEscaper extends LiteralTextEscaper { +// +// private int[] outSourceOffsets; +// +// public GoStringLiteralEscaper(@NotNull GoStringLiteral host) { +// super(host); +// } +// +// @Override +// public boolean decode(@NotNull TextRange rangeInsideHost, @NotNull StringBuilder outChars) { +// TextRange.assertProperRange(rangeInsideHost); +// +// String subText = rangeInsideHost.substring(myHost.getText()); +// +// if (myHost.getRawString() != null) { +// outChars.append(subText); +// return true; +// } +// +// return parseStringCharacters(subText, outChars); +// } +// +// @Override +// public int getOffsetInHost(int offsetInDecoded, @NotNull TextRange rangeInsideHost) { +// TextRange.assertProperRange(rangeInsideHost); +// +// if (myHost.getRawString() != null) { +// int offset = offsetInDecoded; +// offset += rangeInsideHost.getStartOffset(); +// return offset > rangeInsideHost.getEndOffset() ? -1 : offset; +// } +// +// int result = offsetInDecoded < outSourceOffsets.length ? outSourceOffsets[offsetInDecoded] : -1; +// if (result == -1) return -1; +// return (result <= rangeInsideHost.getLength() ? result : rangeInsideHost.getLength()) + rangeInsideHost.getStartOffset(); +// } +// +// /** +// * Escapes the specified string in accordance with https://golang.org/ref/spec#Rune_literals +// * +// * @param chars +// * @param outChars +// */ +// public static void escapeString(@NotNull String chars, @NotNull StringBuilder outChars) { +// int index = 0; +// +// while (index < chars.length()) { +// int c = chars.codePointAt(index); +// +// switch (c) { +// case (char)7: +// outChars.append("\\a"); +// break; +// +// case '\b': +// outChars.append("\\b"); +// break; +// +// case '\f': +// outChars.append("\\f"); +// break; +// +// case '\n': +// outChars.append("\\n"); +// break; +// +// case '\r': +// outChars.append("\\r"); +// break; +// +// case '\t': +// outChars.append("\\t"); +// break; +// +// case (char)0x0b: +// outChars.append("\\v"); +// break; +// +// case '\\': +// outChars.append("\\\\"); +// break; +// +// case '\'': +// outChars.append("\\'"); +// break; +// +// case '"': +// outChars.append("\\\""); +// break; +// +// default: +// switch (Character.getType(c)) { +// case Character.CONTROL: +// case Character.PRIVATE_USE: +// case Character.UNASSIGNED: +// if (c <= 0xffff) { +// outChars.append("\\u").append(String.format(Locale.US, "%04X", c)); +// } else { +// outChars.append("\\U").append(String.format(Locale.US, "%08X", c)); +// } +// +// break; +// +// default: +// outChars.appendCodePoint(c); +// } +// } +// +// index += Character.charCount(c); +// } +// } +// +// private boolean parseStringCharacters(String chars, StringBuilder outChars) { +// outSourceOffsets = new int[chars.length() + 1]; +// outSourceOffsets[chars.length()] = -1; +// +// if (chars.indexOf('\\') < 0) { +// outChars.append(chars); +// for (int i = 0; i < outSourceOffsets.length; i++) { +// outSourceOffsets[i] = i; +// } +// return true; +// } +// int index = 0; +// +// while (index < chars.length()) { +// char c = chars.charAt(index++); +// +// outSourceOffsets[outChars.length()] = index - 1; +// outSourceOffsets[outChars.length() + 1] = index; +// +// if (c != '\\') { +// outChars.append(c); +// continue; +// } +// if (index == chars.length()) return false; +// c = chars.charAt(index++); +// +// switch (c) { +// case 'a': +// outChars.append((char)7); +// break; +// +// case 'b': +// outChars.append('\b'); +// break; +// +// case 'f': +// outChars.append('\f'); +// break; +// +// case 'n': +// outChars.append('\n'); +// break; +// +// case 'r': +// outChars.append('\r'); +// break; +// +// case 't': +// outChars.append('\t'); +// break; +// +// case 'v': +// outChars.append((char)0x0b); +// break; +// +// case '\\': +// outChars.append('\\'); +// break; +// +// case '\'': +// outChars.append('\''); +// break; +// +// case '"': +// outChars.append('"'); +// break; +// +// case '\n': +// outChars.append('\n'); +// break; +// +// // octal +// case '0': +// case '1': +// case '2': +// case '3': +// case '4': +// case '5': +// case '6': +// case '7': { +// char startC = c; +// int v = (int)c - '0'; +// if (index < chars.length()) { +// c = chars.charAt(index++); +// if ('0' <= c && c <= '7') { +// v <<= 3; +// v += c - '0'; +// if (startC <= '3' && index < chars.length()) { +// c = chars.charAt(index++); +// if ('0' <= c && c <= '7') { +// v <<= 3; +// v += c - '0'; +// } +// else { +// index--; +// } +// } +// } +// else { +// index--; +// } +// } +// outChars.append((char)v); +// } +// break; +// +// // hex +// case 'x': +// if (index + 2 <= chars.length()) { +// try { +// int v = Integer.parseInt(chars.substring(index, index + 2), 16); +// outChars.append((char)v); +// index += 2; +// } +// catch (Exception e) { +// return false; +// } +// } +// else { +// return false; +// } +// break; +// +// // little unicode +// case 'u': +// if (index + 4 <= chars.length()) { +// try { +// int v = Integer.parseInt(chars.substring(index, index + 4), 16); +// c = chars.charAt(index); +// if (c == '+' || c == '-') return false; +// outChars.append((char)v); +// index += 4; +// } +// catch (Exception e) { +// return false; +// } +// } +// else { +// return false; +// } +// break; +// +// // big unicode +// case 'U': +// if (index + 8 <= chars.length()) { +// try { +// int v = Integer.parseInt(chars.substring(index, index + 8), 16); +// c = chars.charAt(index); +// if (c == '+' || c == '-') return false; +// outChars.append((char)v); +// index += 8; +// } +// catch (Exception e) { +// return false; +// } +// } +// else { +// return false; +// } +// break; +// +// default: +// return false; +// } +// +// outSourceOffsets[outChars.length()] = index; +// } +// return true; +// } +// +// @Override +// public boolean isOneLine() { +// return true; +// } +//} diff --git a/src/main/java/com/notzippy/intellij/go/intellij/util/GoTargetSystem.java b/src/main/java/com/notzippy/intellij/go/intellij/util/GoTargetSystem.java index ba07cae693..594845d239 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/util/GoTargetSystem.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/util/GoTargetSystem.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; -import com.goide.project.GoBuildTargetSettings; -import com.goide.project.GoModuleSettings; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.project.GoBuildTargetSettings; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.openapi.module.Module; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; diff --git a/src/main/java/com/notzippy/intellij/go/intellij/util/GoUtil.java b/src/main/java/com/notzippy/intellij/go/intellij/util/GoUtil.java index 54fb7f3eea..e1a61ab9c3 100644 --- a/src/main/java/com/notzippy/intellij/go/intellij/util/GoUtil.java +++ b/src/main/java/com/notzippy/intellij/go/intellij/util/GoUtil.java @@ -14,14 +14,17 @@ * limitations under the License. */ -package com.goide.util; - -import com.goide.GoConstants; -import com.goide.project.GoExcludedPathsSettings; -import com.goide.psi.*; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.runconfig.testing.GoTestFinder; -import com.goide.sdk.GoPackageUtil; +package com.notzippy.intellij.go.intellij.util; + +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.psi.PsiManager; +import com.intellij.psi.search.DelegatingGlobalSearchScope; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.intellij.GoConstants; +import com.notzippy.intellij.go.intellij.project.GoExcludedPathsSettings; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManager; import com.intellij.openapi.extensions.PluginId; @@ -30,12 +33,9 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiManager; -import com.intellij.psi.search.DelegatingGlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; @@ -199,7 +199,7 @@ public boolean contains(@NotNull VirtualFile file) { return !GoTestFinder.isTestFile(file) && super.contains(file); } } - + public static class TestsScope extends DelegatingGlobalSearchScope { public TestsScope(@NotNull GlobalSearchScope baseScope) { super(baseScope); diff --git a/src/main/java/com/notzippy/intellij/go/lexer/GoLexer.java b/src/main/java/com/notzippy/intellij/go/lexer/GoLexer.java index 92cc3df868..93975de418 100644 --- a/src/main/java/com/notzippy/intellij/go/lexer/GoLexer.java +++ b/src/main/java/com/notzippy/intellij/go/lexer/GoLexer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.lexer; +package com.notzippy.intellij.go.lexer; -import com.goide.GoParserDefinition; +import com.notzippy.intellij.go.intellij.GoParserDefinition; import com.intellij.lexer.FlexAdapter; import com.intellij.lexer.MergingLexerAdapter; import com.intellij.psi.tree.TokenSet; diff --git a/src/main/java/com/notzippy/intellij/go/lexer/go.flex b/src/main/java/com/notzippy/intellij/go/lexer/go.flex index 4e73dad0df..0c90e78d92 100644 --- a/src/main/java/com/notzippy/intellij/go/lexer/go.flex +++ b/src/main/java/com/notzippy/intellij/go/lexer/go.flex @@ -1,10 +1,10 @@ -package com.goide.lexer; +package com.notzippy.intellij.go.lexer; import com.intellij.lexer.FlexLexer; import com.intellij.psi.tree.IElementType; -import com.goide.GoTypes; +import com.notzippy.intellij.go.parser.GoTypes; import static com.intellij.psi.TokenType.BAD_CHARACTER; -import static com.goide.GoParserDefinition.*; +import static com.notzippy.intellij.go.intellij.GoParserDefinition.*; %% diff --git a/src/main/java/com/notzippy/intellij/go/parser/GoParserUtil.java b/src/main/java/com/notzippy/intellij/go/parser/GoParserUtil.java index d0e10d2088..b03e257a11 100644 --- a/src/main/java/com/notzippy/intellij/go/parser/GoParserUtil.java +++ b/src/main/java/com/notzippy/intellij/go/parser/GoParserUtil.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package com.goide.parser; +package com.notzippy.intellij.go.parser; -import com.goide.GoParserDefinition; -import com.goide.GoTypes; +import com.notzippy.intellij.go.intellij.GoParserDefinition; import com.intellij.lang.LighterASTNode; import com.intellij.lang.PsiBuilder; import com.intellij.lang.WhitespacesBinders; diff --git a/src/main/java/com/notzippy/intellij/go/parser/GoStringLiteralEscaper.java b/src/main/java/com/notzippy/intellij/go/parser/GoStringLiteralEscaper.java new file mode 100644 index 0000000000..81755f87e7 --- /dev/null +++ b/src/main/java/com/notzippy/intellij/go/parser/GoStringLiteralEscaper.java @@ -0,0 +1,312 @@ +/* + * Copyright 2013-2015 Sergey Ignatov, Alexander Zolotov, Florin Patan + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.notzippy.intellij.go.parser; + +import com.notzippy.intellij.go.grammar.psi.GoStringLiteral; +import com.intellij.openapi.util.TextRange; +import com.intellij.psi.LiteralTextEscaper; +import org.jetbrains.annotations.NotNull; + +import java.util.Locale; + +public class GoStringLiteralEscaper extends LiteralTextEscaper { + + private int[] outSourceOffsets; + + public GoStringLiteralEscaper(@NotNull GoStringLiteral host) { + super(host); + } + + @Override + public boolean decode(@NotNull TextRange rangeInsideHost, @NotNull StringBuilder outChars) { + TextRange.assertProperRange(rangeInsideHost); + + String subText = rangeInsideHost.substring(myHost.getText()); + + if (myHost.getRawString() != null) { + outChars.append(subText); + return true; + } + + return parseStringCharacters(subText, outChars); + } + + @Override + public int getOffsetInHost(int offsetInDecoded, @NotNull TextRange rangeInsideHost) { + TextRange.assertProperRange(rangeInsideHost); + + if (myHost.getRawString() != null) { + int offset = offsetInDecoded; + offset += rangeInsideHost.getStartOffset(); + return offset > rangeInsideHost.getEndOffset() ? -1 : offset; + } + + int result = offsetInDecoded < outSourceOffsets.length ? outSourceOffsets[offsetInDecoded] : -1; + if (result == -1) return -1; + return (result <= rangeInsideHost.getLength() ? result : rangeInsideHost.getLength()) + rangeInsideHost.getStartOffset(); + } + + /** + * Escapes the specified string in accordance with https://golang.org/ref/spec#Rune_literals + * + * @param chars + * @param outChars + */ + public static void escapeString(@NotNull String chars, @NotNull StringBuilder outChars) { + int index = 0; + + while (index < chars.length()) { + int c = chars.codePointAt(index); + + switch (c) { + case (char)7: + outChars.append("\\a"); + break; + + case '\b': + outChars.append("\\b"); + break; + + case '\f': + outChars.append("\\f"); + break; + + case '\n': + outChars.append("\\n"); + break; + + case '\r': + outChars.append("\\r"); + break; + + case '\t': + outChars.append("\\t"); + break; + + case (char)0x0b: + outChars.append("\\v"); + break; + + case '\\': + outChars.append("\\\\"); + break; + + case '\'': + outChars.append("\\'"); + break; + + case '"': + outChars.append("\\\""); + break; + + default: + switch (Character.getType(c)) { + case Character.CONTROL: + case Character.PRIVATE_USE: + case Character.UNASSIGNED: + if (c <= 0xffff) { + outChars.append("\\u").append(String.format(Locale.US, "%04X", c)); + } else { + outChars.append("\\U").append(String.format(Locale.US, "%08X", c)); + } + + break; + + default: + outChars.appendCodePoint(c); + } + } + + index += Character.charCount(c); + } + } + + private boolean parseStringCharacters(String chars, StringBuilder outChars) { + outSourceOffsets = new int[chars.length() + 1]; + outSourceOffsets[chars.length()] = -1; + + if (chars.indexOf('\\') < 0) { + outChars.append(chars); + for (int i = 0; i < outSourceOffsets.length; i++) { + outSourceOffsets[i] = i; + } + return true; + } + int index = 0; + + while (index < chars.length()) { + char c = chars.charAt(index++); + + outSourceOffsets[outChars.length()] = index - 1; + outSourceOffsets[outChars.length() + 1] = index; + + if (c != '\\') { + outChars.append(c); + continue; + } + if (index == chars.length()) return false; + c = chars.charAt(index++); + + switch (c) { + case 'a': + outChars.append((char)7); + break; + + case 'b': + outChars.append('\b'); + break; + + case 'f': + outChars.append('\f'); + break; + + case 'n': + outChars.append('\n'); + break; + + case 'r': + outChars.append('\r'); + break; + + case 't': + outChars.append('\t'); + break; + + case 'v': + outChars.append((char)0x0b); + break; + + case '\\': + outChars.append('\\'); + break; + + case '\'': + outChars.append('\''); + break; + + case '"': + outChars.append('"'); + break; + + case '\n': + outChars.append('\n'); + break; + + // octal + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': { + char startC = c; + int v = (int)c - '0'; + if (index < chars.length()) { + c = chars.charAt(index++); + if ('0' <= c && c <= '7') { + v <<= 3; + v += c - '0'; + if (startC <= '3' && index < chars.length()) { + c = chars.charAt(index++); + if ('0' <= c && c <= '7') { + v <<= 3; + v += c - '0'; + } + else { + index--; + } + } + } + else { + index--; + } + } + outChars.append((char)v); + } + break; + + // hex + case 'x': + if (index + 2 <= chars.length()) { + try { + int v = Integer.parseInt(chars.substring(index, index + 2), 16); + outChars.append((char)v); + index += 2; + } + catch (Exception e) { + return false; + } + } + else { + return false; + } + break; + + // little unicode + case 'u': + if (index + 4 <= chars.length()) { + try { + int v = Integer.parseInt(chars.substring(index, index + 4), 16); + c = chars.charAt(index); + if (c == '+' || c == '-') return false; + outChars.append((char)v); + index += 4; + } + catch (Exception e) { + return false; + } + } + else { + return false; + } + break; + + // big unicode + case 'U': + if (index + 8 <= chars.length()) { + try { + int v = Integer.parseInt(chars.substring(index, index + 8), 16); + c = chars.charAt(index); + if (c == '+' || c == '-') return false; + outChars.append((char)v); + index += 8; + } + catch (Exception e) { + return false; + } + } + else { + return false; + } + break; + + default: + return false; + } + + outSourceOffsets[outChars.length()] = index; + } + return true; + } + + @Override + public boolean isOneLine() { + return true; + } +} diff --git a/src/main/java/com/notzippy/intellij/go/parser/GoTypes.java.old b/src/main/java/com/notzippy/intellij/go/parser/GoTypes.java.old new file mode 100644 index 0000000000..877bc2d093 --- /dev/null +++ b/src/main/java/com/notzippy/intellij/go/parser/GoTypes.java.old @@ -0,0 +1,525 @@ +/* + * Copyright 2013-2016 Sergey Ignatov, Alexander Zolotov, Florin Patan + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// This is a generated file. Not intended for manual editing. +package com.notzippy.intellij.go.parser; + +import com.notzippy.intellij.go.grammar.psi.impl.*; +import com.intellij.psi.tree.IElementType; +import com.intellij.psi.PsiElement; +import com.intellij.lang.ASTNode; +import com.notzippy.intellij.go.grammar.psi.GoCompositeElementType; +import com.notzippy.intellij.go.stubs.GoElementTypeFactory; +import com.notzippy.intellij.go.grammar.psi.GoTokenType; + +public interface GoTypes { + + IElementType ADD_EXPR = new GoCompositeElementType("ADD_EXPR"); + IElementType AND_EXPR = new GoCompositeElementType("AND_EXPR"); + IElementType ANONYMOUS_FIELD_DEFINITION = GoElementTypeFactory.stubFactory("ANONYMOUS_FIELD_DEFINITION"); + IElementType ARGUMENT_LIST = new GoCompositeElementType("ARGUMENT_LIST"); + IElementType ARRAY_OR_SLICE_TYPE = GoElementTypeFactory.stubFactory("ARRAY_OR_SLICE_TYPE"); + IElementType ASSIGNMENT_STATEMENT = new GoCompositeElementType("ASSIGNMENT_STATEMENT"); + IElementType ASSIGN_OP = new GoCompositeElementType("ASSIGN_OP"); + IElementType BLOCK = new GoCompositeElementType("BLOCK"); + IElementType BREAK_STATEMENT = new GoCompositeElementType("BREAK_STATEMENT"); + IElementType BUILTIN_ARGUMENT_LIST = new GoCompositeElementType("BUILTIN_ARGUMENT_LIST"); + IElementType BUILTIN_CALL_EXPR = new GoCompositeElementType("BUILTIN_CALL_EXPR"); + IElementType CALL_EXPR = new GoCompositeElementType("CALL_EXPR"); + IElementType CHANNEL_TYPE = GoElementTypeFactory.stubFactory("CHANNEL_TYPE"); + IElementType COMM_CASE = new GoCompositeElementType("COMM_CASE"); + IElementType COMM_CLAUSE = new GoCompositeElementType("COMM_CLAUSE"); + IElementType COMPOSITE_LIT = new GoCompositeElementType("COMPOSITE_LIT"); + IElementType CONDITIONAL_EXPR = new GoCompositeElementType("CONDITIONAL_EXPR"); + IElementType CONST_DECLARATION = new GoCompositeElementType("CONST_DECLARATION"); + IElementType CONST_DEFINITION = GoElementTypeFactory.stubFactory("CONST_DEFINITION"); + IElementType CONST_SPEC = GoElementTypeFactory.stubFactory("CONST_SPEC"); + IElementType CONTINUE_STATEMENT = new GoCompositeElementType("CONTINUE_STATEMENT"); + IElementType CONVERSION_EXPR = new GoCompositeElementType("CONVERSION_EXPR"); + IElementType DEFER_STATEMENT = new GoCompositeElementType("DEFER_STATEMENT"); + IElementType ELEMENT = new GoCompositeElementType("ELEMENT"); + IElementType ELSE_STATEMENT = new GoCompositeElementType("ELSE_STATEMENT"); + IElementType EXPRESSION = new GoCompositeElementType("EXPRESSION"); + IElementType EXPR_CASE_CLAUSE = new GoCompositeElementType("EXPR_CASE_CLAUSE"); + IElementType EXPR_SWITCH_STATEMENT = new GoCompositeElementType("EXPR_SWITCH_STATEMENT"); + IElementType FALLTHROUGH_STATEMENT = new GoCompositeElementType("FALLTHROUGH_STATEMENT"); + IElementType FIELD_DECLARATION = new GoCompositeElementType("FIELD_DECLARATION"); + IElementType FIELD_DEFINITION = GoElementTypeFactory.stubFactory("FIELD_DEFINITION"); + IElementType FIELD_NAME = new GoCompositeElementType("FIELD_NAME"); + IElementType FOR_CLAUSE = new GoCompositeElementType("FOR_CLAUSE"); + IElementType FOR_STATEMENT = new GoCompositeElementType("FOR_STATEMENT"); + IElementType FUNCTION_DECLARATION = GoElementTypeFactory.stubFactory("FUNCTION_DECLARATION"); + IElementType FUNCTION_LIT = new GoCompositeElementType("FUNCTION_LIT"); + IElementType FUNCTION_TYPE = GoElementTypeFactory.stubFactory("FUNCTION_TYPE"); + IElementType GOTO_STATEMENT = new GoCompositeElementType("GOTO_STATEMENT"); + IElementType GO_STATEMENT = new GoCompositeElementType("GO_STATEMENT"); + IElementType IF_STATEMENT = new GoCompositeElementType("IF_STATEMENT"); + IElementType IMPORT_DECLARATION = new GoCompositeElementType("IMPORT_DECLARATION"); + IElementType IMPORT_LIST = new GoCompositeElementType("IMPORT_LIST"); + IElementType IMPORT_SPEC = GoElementTypeFactory.stubFactory("IMPORT_SPEC"); + IElementType IMPORT_STRING = new GoCompositeElementType("IMPORT_STRING"); + IElementType INC_DEC_STATEMENT = new GoCompositeElementType("INC_DEC_STATEMENT"); + IElementType INDEX_OR_SLICE_EXPR = new GoCompositeElementType("INDEX_OR_SLICE_EXPR"); + IElementType INTERFACE_TYPE = GoElementTypeFactory.stubFactory("INTERFACE_TYPE"); + IElementType KEY = new GoCompositeElementType("KEY"); + IElementType LABELED_STATEMENT = new GoCompositeElementType("LABELED_STATEMENT"); + IElementType LABEL_DEFINITION = GoElementTypeFactory.stubFactory("LABEL_DEFINITION"); + IElementType LABEL_REF = new GoCompositeElementType("LABEL_REF"); + IElementType LEFT_HAND_EXPR_LIST = new GoCompositeElementType("LEFT_HAND_EXPR_LIST"); + IElementType LITERAL = new GoCompositeElementType("LITERAL"); + IElementType LITERAL_TYPE_EXPR = new GoCompositeElementType("LITERAL_TYPE_EXPR"); + IElementType LITERAL_VALUE = new GoCompositeElementType("LITERAL_VALUE"); + IElementType MAP_TYPE = GoElementTypeFactory.stubFactory("MAP_TYPE"); + IElementType METHOD_DECLARATION = GoElementTypeFactory.stubFactory("METHOD_DECLARATION"); + IElementType METHOD_SPEC = GoElementTypeFactory.stubFactory("METHOD_SPEC"); + IElementType MUL_EXPR = new GoCompositeElementType("MUL_EXPR"); + IElementType OR_EXPR = new GoCompositeElementType("OR_EXPR"); + IElementType PACKAGE_CLAUSE = GoElementTypeFactory.stubFactory("PACKAGE_CLAUSE"); + IElementType PARAMETERS = GoElementTypeFactory.stubFactory("PARAMETERS"); + IElementType PARAMETER_DECLARATION = GoElementTypeFactory.stubFactory("PARAMETER_DECLARATION"); + IElementType PARAM_DEFINITION = GoElementTypeFactory.stubFactory("PARAM_DEFINITION"); + IElementType PARENTHESES_EXPR = new GoCompositeElementType("PARENTHESES_EXPR"); + IElementType PAR_TYPE = GoElementTypeFactory.stubFactory("PAR_TYPE"); + IElementType POINTER_TYPE = GoElementTypeFactory.stubFactory("POINTER_TYPE"); + IElementType RANGE_CLAUSE = GoElementTypeFactory.stubFactory("RANGE_CLAUSE"); + IElementType RECEIVER = GoElementTypeFactory.stubFactory("RECEIVER"); + IElementType RECV_STATEMENT = GoElementTypeFactory.stubFactory("RECV_STATEMENT"); + IElementType REFERENCE_EXPRESSION = new GoCompositeElementType("REFERENCE_EXPRESSION"); + IElementType RESULT = GoElementTypeFactory.stubFactory("RESULT"); + IElementType RETURN_STATEMENT = new GoCompositeElementType("RETURN_STATEMENT"); + IElementType SELECTOR_EXPR = new GoCompositeElementType("SELECTOR_EXPR"); + IElementType SELECT_STATEMENT = new GoCompositeElementType("SELECT_STATEMENT"); + IElementType SEND_STATEMENT = new GoCompositeElementType("SEND_STATEMENT"); + IElementType SHORT_VAR_DECLARATION = GoElementTypeFactory.stubFactory("SHORT_VAR_DECLARATION"); + IElementType SIGNATURE = GoElementTypeFactory.stubFactory("SIGNATURE"); + IElementType SIMPLE_STATEMENT = new GoCompositeElementType("SIMPLE_STATEMENT"); + IElementType SPEC_TYPE = GoElementTypeFactory.stubFactory("SPEC_TYPE"); + IElementType STATEMENT = new GoCompositeElementType("STATEMENT"); + IElementType STRING_LITERAL = new GoCompositeElementType("STRING_LITERAL"); + IElementType STRUCT_TYPE = GoElementTypeFactory.stubFactory("STRUCT_TYPE"); + IElementType SWITCH_START = new GoCompositeElementType("SWITCH_START"); + IElementType SWITCH_STATEMENT = new GoCompositeElementType("SWITCH_STATEMENT"); + IElementType TAG = new GoCompositeElementType("TAG"); + IElementType TYPE = GoElementTypeFactory.stubFactory("TYPE"); + IElementType TYPE_ASSERTION_EXPR = new GoCompositeElementType("TYPE_ASSERTION_EXPR"); + IElementType TYPE_CASE_CLAUSE = new GoCompositeElementType("TYPE_CASE_CLAUSE"); + IElementType TYPE_DECLARATION = new GoCompositeElementType("TYPE_DECLARATION"); + IElementType TYPE_GUARD = new GoCompositeElementType("TYPE_GUARD"); + IElementType TYPE_LIST = GoElementTypeFactory.stubFactory("TYPE_LIST"); + IElementType TYPE_REFERENCE_EXPRESSION = new GoCompositeElementType("TYPE_REFERENCE_EXPRESSION"); + IElementType TYPE_SPEC = GoElementTypeFactory.stubFactory("TYPE_SPEC"); + IElementType TYPE_SWITCH_GUARD = new GoCompositeElementType("TYPE_SWITCH_GUARD"); + IElementType TYPE_SWITCH_STATEMENT = new GoCompositeElementType("TYPE_SWITCH_STATEMENT"); + IElementType UNARY_EXPR = new GoCompositeElementType("UNARY_EXPR"); + IElementType VALUE = new GoCompositeElementType("VALUE"); + IElementType VAR_DECLARATION = new GoCompositeElementType("VAR_DECLARATION"); + IElementType VAR_DEFINITION = GoElementTypeFactory.stubFactory("VAR_DEFINITION"); + IElementType VAR_SPEC = GoElementTypeFactory.stubFactory("VAR_SPEC"); + + IElementType ASSIGN = new GoTokenType("="); + IElementType BIT_AND = new GoTokenType("&"); + IElementType BIT_AND_ASSIGN = new GoTokenType("&="); + IElementType BIT_CLEAR = new GoTokenType("&^"); + IElementType BIT_CLEAR_ASSIGN = new GoTokenType("&^="); + IElementType BIT_OR = new GoTokenType("|"); + IElementType BIT_OR_ASSIGN = new GoTokenType("|="); + IElementType BIT_XOR = new GoTokenType("^"); + IElementType BIT_XOR_ASSIGN = new GoTokenType("^="); + IElementType BREAK = new GoTokenType("break"); + IElementType CASE = new GoTokenType("case"); + IElementType CHAN = new GoTokenType("chan"); + IElementType CHAR = new GoTokenType("char"); + IElementType COLON = new GoTokenType(":"); + IElementType COMMA = new GoTokenType(","); + IElementType COND_AND = new GoTokenType("&&"); + IElementType COND_OR = new GoTokenType("||"); + IElementType CONST = new GoTokenType("const"); + IElementType CONTINUE = new GoTokenType("continue"); + IElementType DECIMALI = new GoTokenType("decimali"); + IElementType DEFAULT = new GoTokenType("default"); + IElementType DEFER = new GoTokenType("defer"); + IElementType DOT = new GoTokenType("."); + IElementType ELSE = new GoTokenType("else"); + IElementType EQ = new GoTokenType("=="); + IElementType FALLTHROUGH = new GoTokenType("fallthrough"); + IElementType FLOAT = new GoTokenType("float"); + IElementType FLOATI = new GoTokenType("floati"); + IElementType FOR = new GoTokenType("for"); + IElementType FUNC = new GoTokenType("func"); + IElementType GO = new GoTokenType("go"); + IElementType GOTO = new GoTokenType("goto"); + IElementType GREATER = new GoTokenType(">"); + IElementType GREATER_OR_EQUAL = new GoTokenType(">="); + IElementType HEX = new GoTokenType("hex"); + IElementType IDENTIFIER = new GoTokenType("identifier"); + IElementType IF = new GoTokenType("if"); + IElementType IMPORT = new GoTokenType("import"); + IElementType INT = new GoTokenType("int"); + IElementType INTERFACE = new GoTokenType("interface"); + IElementType LBRACE = new GoTokenType("{"); + IElementType LBRACK = new GoTokenType("["); + IElementType LESS = new GoTokenType("<"); + IElementType LESS_OR_EQUAL = new GoTokenType("<="); + IElementType LPAREN = new GoTokenType("("); + IElementType MAP = new GoTokenType("map"); + IElementType MINUS = new GoTokenType("-"); + IElementType MINUS_ASSIGN = new GoTokenType("-="); + IElementType MINUS_MINUS = new GoTokenType("--"); + IElementType MUL = new GoTokenType("*"); + IElementType MUL_ASSIGN = new GoTokenType("*="); + IElementType NOT = new GoTokenType("!"); + IElementType NOT_EQ = new GoTokenType("!="); + IElementType OCT = new GoTokenType("oct"); + IElementType PACKAGE = new GoTokenType("package"); + IElementType PLUS = new GoTokenType("+"); + IElementType PLUS_ASSIGN = new GoTokenType("+="); + IElementType PLUS_PLUS = new GoTokenType("++"); + IElementType QUOTIENT = new GoTokenType("/"); + IElementType QUOTIENT_ASSIGN = new GoTokenType("/="); + IElementType RANGE = new GoTokenType("range"); + IElementType RAW_STRING = new GoTokenType("raw_string"); + IElementType RBRACE = new GoTokenType("}"); + IElementType RBRACK = new GoTokenType("]"); + IElementType REMAINDER = new GoTokenType("%"); + IElementType REMAINDER_ASSIGN = new GoTokenType("%="); + IElementType RETURN = new GoTokenType("return"); + IElementType RPAREN = new GoTokenType(")"); + IElementType SELECT = new GoTokenType("select"); + IElementType SEMICOLON = new GoTokenType(";"); + IElementType SEMICOLON_SYNTHETIC = new GoTokenType(""); + IElementType SEND_CHANNEL = new GoTokenType("<-"); + IElementType SHIFT_LEFT = new GoTokenType("<<"); + IElementType SHIFT_LEFT_ASSIGN = new GoTokenType("<<="); + IElementType SHIFT_RIGHT = new GoTokenType(">>"); + IElementType SHIFT_RIGHT_ASSIGN = new GoTokenType(">>="); + IElementType STRING = new GoTokenType("string"); + IElementType STRUCT = new GoTokenType("struct"); + IElementType SWITCH = new GoTokenType("switch"); + IElementType TRIPLE_DOT = new GoTokenType("..."); + IElementType TYPE_ = new GoTokenType("type"); + IElementType VAR = new GoTokenType("var"); + IElementType VAR_ASSIGN = new GoTokenType(":="); + + class Factory { + public static PsiElement createElement(ASTNode node) { + IElementType type = node.getElementType(); + if (type == ADD_EXPR) { + return new GoAddExprImpl(node); + } + else if (type == AND_EXPR) { + return new GoAndExprImpl(node); + } + else if (type == ANONYMOUS_FIELD_DEFINITION) { + return new GoAnonymousFieldDefinitionImpl(node); + } + else if (type == ARGUMENT_LIST) { + return new GoArgumentListImpl(node); + } + else if (type == ARRAY_OR_SLICE_TYPE) { + return new GoArrayOrSliceTypeImpl(node); + } + else if (type == ASSIGNMENT_STATEMENT) { + return new GoAssignmentStatementImpl(node); + } + else if (type == ASSIGN_OP) { + return new GoAssignOpImpl(node); + } + else if (type == BLOCK) { + return new GoBlockImpl(node); + } + else if (type == BREAK_STATEMENT) { + return new GoBreakStatementImpl(node); + } + else if (type == BUILTIN_ARGUMENT_LIST) { + return new GoBuiltinArgumentListImpl(node); + } + else if (type == BUILTIN_CALL_EXPR) { + return new GoBuiltinCallExprImpl(node); + } + else if (type == CALL_EXPR) { + return new GoCallExprImpl(node); + } + else if (type == CHANNEL_TYPE) { + return new GoChannelTypeImpl(node); + } + else if (type == COMM_CASE) { + return new GoCommCaseImpl(node); + } + else if (type == COMM_CLAUSE) { + return new GoCommClauseImpl(node); + } + else if (type == COMPOSITE_LIT) { + return new GoCompositeLitImpl(node); + } + else if (type == CONDITIONAL_EXPR) { + return new GoConditionalExprImpl(node); + } + else if (type == CONST_DECLARATION) { + return new GoConstDeclarationImpl(node); + } + else if (type == CONST_DEFINITION) { + return new GoConstDefinitionImpl(node); + } + else if (type == CONST_SPEC) { + return new GoConstSpecImpl(node); + } + else if (type == CONTINUE_STATEMENT) { + return new GoContinueStatementImpl(node); + } + else if (type == CONVERSION_EXPR) { + return new GoConversionExprImpl(node); + } + else if (type == DEFER_STATEMENT) { + return new GoDeferStatementImpl(node); + } + else if (type == ELEMENT) { + return new GoElementImpl(node); + } + else if (type == ELSE_STATEMENT) { + return new GoElseStatementImpl(node); + } + else if (type == EXPRESSION) { + return new GoExpressionImpl(node); + } + else if (type == EXPR_CASE_CLAUSE) { + return new GoExprCaseClauseImpl(node); + } + else if (type == EXPR_SWITCH_STATEMENT) { + return new GoExprSwitchStatementImpl(node); + } + else if (type == FALLTHROUGH_STATEMENT) { + return new GoFallthroughStatementImpl(node); + } + else if (type == FIELD_DECLARATION) { + return new GoFieldDeclarationImpl(node); + } + else if (type == FIELD_DEFINITION) { + return new GoFieldDefinitionImpl(node); + } + else if (type == FIELD_NAME) { + return new GoFieldNameImpl(node); + } + else if (type == FOR_CLAUSE) { + return new GoForClauseImpl(node); + } + else if (type == FOR_STATEMENT) { + return new GoForStatementImpl(node); + } + else if (type == FUNCTION_DECLARATION) { + return new GoFunctionDeclarationImpl(node); + } + else if (type == FUNCTION_LIT) { + return new GoFunctionLitImpl(node); + } + else if (type == FUNCTION_TYPE) { + return new GoFunctionTypeImpl(node); + } + else if (type == GOTO_STATEMENT) { + return new GoGotoStatementImpl(node); + } + else if (type == GO_STATEMENT) { + return new GoGoStatementImpl(node); + } + else if (type == IF_STATEMENT) { + return new GoIfStatementImpl(node); + } + else if (type == IMPORT_DECLARATION) { + return new GoImportDeclarationImpl(node); + } + else if (type == IMPORT_LIST) { + return new GoImportListImpl(node); + } + else if (type == IMPORT_SPEC) { + return new GoImportSpecImpl(node); + } + else if (type == IMPORT_STRING) { + return new GoImportStringImpl(node); + } + else if (type == INC_DEC_STATEMENT) { + return new GoIncDecStatementImpl(node); + } + else if (type == INDEX_OR_SLICE_EXPR) { + return new GoIndexOrSliceExprImpl(node); + } + else if (type == INTERFACE_TYPE) { + return new GoInterfaceTypeImpl(node); + } + else if (type == KEY) { + return new GoKeyImpl(node); + } + else if (type == LABELED_STATEMENT) { + return new GoLabeledStatementImpl(node); + } + else if (type == LABEL_DEFINITION) { + return new GoLabelDefinitionImpl(node); + } + else if (type == LABEL_REF) { + return new GoLabelRefImpl(node); + } + else if (type == LEFT_HAND_EXPR_LIST) { + return new GoLeftHandExprListImpl(node); + } + else if (type == LITERAL) { + return new GoLiteralImpl(node); + } + else if (type == LITERAL_TYPE_EXPR) { + return new GoLiteralTypeExprImpl(node); + } + else if (type == LITERAL_VALUE) { + return new GoLiteralValueImpl(node); + } + else if (type == MAP_TYPE) { + return new GoMapTypeImpl(node); + } + else if (type == METHOD_DECLARATION) { + return new GoMethodDeclarationImpl(node); + } + else if (type == METHOD_SPEC) { + return new GoMethodSpecImpl(node); + } + else if (type == MUL_EXPR) { + return new GoMulExprImpl(node); + } + else if (type == OR_EXPR) { + return new GoOrExprImpl(node); + } + else if (type == PACKAGE_CLAUSE) { + return new GoPackageClauseImpl(node); + } + else if (type == PARAMETERS) { + return new GoParametersImpl(node); + } + else if (type == PARAMETER_DECLARATION) { + return new GoParameterDeclarationImpl(node); + } + else if (type == PARAM_DEFINITION) { + return new GoParamDefinitionImpl(node); + } + else if (type == PARENTHESES_EXPR) { + return new GoParenthesesExprImpl(node); + } + else if (type == PAR_TYPE) { + return new GoParTypeImpl(node); + } + else if (type == POINTER_TYPE) { + return new GoPointerTypeImpl(node); + } + else if (type == RANGE_CLAUSE) { + return new GoRangeClauseImpl(node); + } + else if (type == RECEIVER) { + return new GoReceiverImpl(node); + } + else if (type == RECV_STATEMENT) { + return new GoRecvStatementImpl(node); + } + else if (type == REFERENCE_EXPRESSION) { + return new GoReferenceExpressionImpl(node); + } + else if (type == RESULT) { + return new GoResultImpl(node); + } + else if (type == RETURN_STATEMENT) { + return new GoReturnStatementImpl(node); + } + else if (type == SELECTOR_EXPR) { + return new GoSelectorExprImpl(node); + } + else if (type == SELECT_STATEMENT) { + return new GoSelectStatementImpl(node); + } + else if (type == SEND_STATEMENT) { + return new GoSendStatementImpl(node); + } + else if (type == SHORT_VAR_DECLARATION) { + return new GoShortVarDeclarationImpl(node); + } + else if (type == SIGNATURE) { + return new GoSignatureImpl(node); + } + else if (type == SIMPLE_STATEMENT) { + return new GoSimpleStatementImpl(node); + } + else if (type == SPEC_TYPE) { + return new GoSpecTypeImpl(node); + } + else if (type == STATEMENT) { + return new GoStatementImpl(node); + } + else if (type == STRING_LITERAL) { + return new GoStringLiteralImpl(node); + } + else if (type == STRUCT_TYPE) { + return new GoStructTypeImpl(node); + } + else if (type == SWITCH_START) { + return new GoSwitchStartImpl(node); + } + else if (type == SWITCH_STATEMENT) { + return new GoSwitchStatementImpl(node); + } + else if (type == TAG) { + return new GoTagImpl(node); + } + else if (type == TYPE) { + return new GoTypeImpl(node); + } + else if (type == TYPE_ASSERTION_EXPR) { + return new GoTypeAssertionExprImpl(node); + } + else if (type == TYPE_CASE_CLAUSE) { + return new GoTypeCaseClauseImpl(node); + } + else if (type == TYPE_DECLARATION) { + return new GoTypeDeclarationImpl(node); + } + else if (type == TYPE_GUARD) { + return new GoTypeGuardImpl(node); + } + else if (type == TYPE_LIST) { + return new GoTypeListImpl(node); + } + else if (type == TYPE_REFERENCE_EXPRESSION) { + return new GoTypeReferenceExpressionImpl(node); + } + else if (type == TYPE_SPEC) { + return new GoTypeSpecImpl(node); + } + else if (type == TYPE_SWITCH_GUARD) { + return new GoTypeSwitchGuardImpl(node); + } + else if (type == TYPE_SWITCH_STATEMENT) { + return new GoTypeSwitchStatementImpl(node); + } + else if (type == UNARY_EXPR) { + return new GoUnaryExprImpl(node); + } + else if (type == VALUE) { + return new GoValueImpl(node); + } + else if (type == VAR_DECLARATION) { + return new GoVarDeclarationImpl(node); + } + else if (type == VAR_DEFINITION) { + return new GoVarDefinitionImpl(node); + } + else if (type == VAR_SPEC) { + return new GoVarSpecImpl(node); + } + throw new AssertionError("Unknown element type: " + type); + } + } +} diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoAnonymousFieldDefinitionStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoAnonymousFieldDefinitionStub.java index 55e6d2fce9..004f17ade0 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoAnonymousFieldDefinitionStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoAnonymousFieldDefinitionStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoAnonymousFieldDefinition; +import com.notzippy.intellij.go.grammar.psi.GoAnonymousFieldDefinition; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoConstDefinitionStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoConstDefinitionStub.java index 011168b26c..d1fc327be5 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoConstDefinitionStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoConstDefinitionStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoConstDefinition; +import com.notzippy.intellij.go.grammar.psi.GoConstDefinition; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoConstSpecStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoConstSpecStub.java index 49607d2b94..264dafb000 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoConstSpecStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoConstSpecStub.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoConstSpec; -import com.goide.psi.GoExpression; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.grammar.psi.GoConstSpec; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.stubs.IStubElementType; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoElementTypeFactory.java b/src/main/java/com/notzippy/intellij/go/stubs/GoElementTypeFactory.java index ebcd652283..366e31fe68 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoElementTypeFactory.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoElementTypeFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoType; -import com.goide.psi.GoVarSpec; -import com.goide.psi.impl.*; -import com.goide.stubs.types.*; +import com.notzippy.intellij.go.grammar.psi.GoType; +import com.notzippy.intellij.go.grammar.psi.GoVarSpec; +import com.notzippy.intellij.go.grammar.psi.impl.*; +import com.notzippy.intellij.go.stubs.types.*; import com.intellij.psi.stubs.IStubElementType; import com.intellij.util.ReflectionUtil; import com.intellij.util.containers.HashMap; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoFieldDefinitionStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoFieldDefinitionStub.java index 4424afc921..a4770f92d2 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoFieldDefinitionStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoFieldDefinitionStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoFieldDefinition; +import com.notzippy.intellij.go.grammar.psi.GoFieldDefinition; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoFileStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoFileStub.java index a84efb72ef..6927383df6 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoFileStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoFileStub.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.GoFileElementType; -import com.goide.psi.GoFile; -import com.goide.psi.GoPackageClause; -import com.goide.stubs.types.GoPackageClauseStubElementType; +import com.notzippy.intellij.go.stubs.types.GoPackageClauseStubElementType; +import com.notzippy.intellij.go.intellij.GoFileElementType; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoPackageClause; import com.intellij.psi.stubs.PsiFileStubImpl; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.tree.IStubFileElementType; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoFunctionDeclarationStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoFunctionDeclarationStub.java index 2819a49100..04c1072ec0 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoFunctionDeclarationStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoFunctionDeclarationStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoFunctionOrMethodDeclarationStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoFunctionOrMethodDeclarationStub.java index dd70e8f750..31c609b40c 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoFunctionOrMethodDeclarationStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoFunctionOrMethodDeclarationStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoImportSpecStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoImportSpecStub.java index 285f776100..44e97b4e32 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoImportSpecStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoImportSpecStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoImportSpec; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoLabelDefinitionStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoLabelDefinitionStub.java index c9ac5a4d73..9805fa3ed8 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoLabelDefinitionStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoLabelDefinitionStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoLabelDefinition; +import com.notzippy.intellij.go.grammar.psi.GoLabelDefinition; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoMethodDeclarationStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoMethodDeclarationStub.java index 29013c4466..99473019a6 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoMethodDeclarationStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoMethodDeclarationStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoMethodDeclaration; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoMethodSpecStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoMethodSpecStub.java index 33ef66bee2..d66eb607aa 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoMethodSpecStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoMethodSpecStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoMethodSpec; +import com.notzippy.intellij.go.grammar.psi.GoMethodSpec; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoNamedStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoNamedStub.java index 747d642868..bb240f0448 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoNamedStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoNamedStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.NamedStubBase; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoPackageClauseStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoPackageClauseStub.java index 3bfa5031ea..6fbb6b887d 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoPackageClauseStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoPackageClauseStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoPackageClause; +import com.notzippy.intellij.go.grammar.psi.GoPackageClause; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubBase; import com.intellij.psi.stubs.StubElement; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoParamDefinitionStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoParamDefinitionStub.java index b6a8e20961..f3010de165 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoParamDefinitionStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoParamDefinitionStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoParamDefinition; +import com.notzippy.intellij.go.grammar.psi.GoParamDefinition; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoParameterDeclarationStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoParameterDeclarationStub.java index 18b138f4a3..6ab5e67cbb 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoParameterDeclarationStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoParameterDeclarationStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoParameterDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoParameterDeclaration; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoParametersStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoParametersStub.java index 79e69ea972..6b081c8b25 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoParametersStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoParametersStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoParameters; +import com.notzippy.intellij.go.grammar.psi.GoParameters; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoReceiverStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoReceiverStub.java index b1bced796a..2ad6c45b7d 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoReceiverStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoReceiverStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoReceiver; +import com.notzippy.intellij.go.grammar.psi.GoReceiver; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoResultStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoResultStub.java index 2ae6406b88..4b746f9cdb 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoResultStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoResultStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoResult; +import com.notzippy.intellij.go.grammar.psi.GoResult; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoSignatureStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoSignatureStub.java index f8b2e62757..f318ecf827 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoSignatureStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoSignatureStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoSignature; +import com.notzippy.intellij.go.grammar.psi.GoSignature; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoTypeSpecStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoTypeSpecStub.java index b511d7bb01..ceea301b68 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoTypeSpecStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoTypeSpecStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoTypeSpec; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoTypeStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoTypeStub.java index 2262f39a03..e12dc79c63 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoTypeStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoTypeStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoType; +import com.notzippy.intellij.go.grammar.psi.GoType; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoVarDefinitionStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoVarDefinitionStub.java index 3f5542afa9..b3d8a540c7 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoVarDefinitionStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoVarDefinitionStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoVarDefinition; +import com.notzippy.intellij.go.grammar.psi.GoVarDefinition; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import com.intellij.util.io.StringRef; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/GoVarSpecStub.java b/src/main/java/com/notzippy/intellij/go/stubs/GoVarSpecStub.java index 9e35dd3b22..c5e2bb0787 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/GoVarSpecStub.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/GoVarSpecStub.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; -import com.goide.psi.GoVarSpec; +import com.notzippy.intellij.go.grammar.psi.GoVarSpec; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubBase; import com.intellij.psi.stubs.StubElement; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/StubWithText.java b/src/main/java/com/notzippy/intellij/go/stubs/StubWithText.java index 5867b77daf..b352d4daad 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/StubWithText.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/StubWithText.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; import com.intellij.psi.PsiElement; import com.intellij.psi.stubs.IStubElementType; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/TextHolder.java b/src/main/java/com/notzippy/intellij/go/stubs/TextHolder.java index 78bddcbda4..3c0e55b8a4 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/TextHolder.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/TextHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.stubs; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/index/GoAllPrivateNamesIndex.java b/src/main/java/com/notzippy/intellij/go/stubs/index/GoAllPrivateNamesIndex.java index 730d181a26..67e369f925 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/index/GoAllPrivateNamesIndex.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/index/GoAllPrivateNamesIndex.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.stubs.index; +package com.notzippy.intellij.go.stubs.index; -import com.goide.GoFileElementType; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.intellij.GoFileElementType; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.psi.stubs.StringStubIndexExtension; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/index/GoAllPublicNamesIndex.java b/src/main/java/com/notzippy/intellij/go/stubs/index/GoAllPublicNamesIndex.java index ef28314e45..02001fd660 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/index/GoAllPublicNamesIndex.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/index/GoAllPublicNamesIndex.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.stubs.index; +package com.notzippy.intellij.go.stubs.index; -import com.goide.GoFileElementType; -import com.goide.psi.GoNamedElement; +import com.notzippy.intellij.go.intellij.GoFileElementType; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; import com.intellij.psi.stubs.StringStubIndexExtension; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/index/GoFunctionIndex.java b/src/main/java/com/notzippy/intellij/go/stubs/index/GoFunctionIndex.java index d2440d4be4..7a3d3e2ba3 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/index/GoFunctionIndex.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/index/GoFunctionIndex.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.stubs.index; +package com.notzippy.intellij.go.stubs.index; -import com.goide.GoFileElementType; -import com.goide.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.intellij.GoFileElementType; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/index/GoIdFilter.java b/src/main/java/com/notzippy/intellij/go/stubs/index/GoIdFilter.java index 17d0c53f4a..e4b7c2824b 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/index/GoIdFilter.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/index/GoIdFilter.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package com.goide.stubs.index; +package com.notzippy.intellij.go.stubs.index; -import com.goide.runconfig.testing.GoTestFinder; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; @@ -33,6 +32,7 @@ import com.intellij.psi.util.CachedValuesManager; import com.intellij.util.indexing.FileBasedIndex; import com.intellij.util.indexing.IdFilter; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFinder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -53,7 +53,6 @@ private GoIdFilter(@NotNull BitSet idSet) { public boolean containsFileId(int id) { return id >= 0 && myIdSet.get(id); } - public static IdFilter getProductionFilter(@NotNull Project project) { return createIdFilter(project, PRODUCTION_FILTER, file -> !file.isDirectory() && !GoTestFinder.isTestFile(file)); } diff --git a/src/main/java/com/notzippy/intellij/go/stubs/index/GoMethodFingerprintIndex.java b/src/main/java/com/notzippy/intellij/go/stubs/index/GoMethodFingerprintIndex.java index 05be63cf62..8fefc4ea87 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/index/GoMethodFingerprintIndex.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/index/GoMethodFingerprintIndex.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.stubs.index; +package com.notzippy.intellij.go.stubs.index; -import com.goide.GoFileElementType; -import com.goide.psi.GoMethodSpec; +import com.notzippy.intellij.go.intellij.GoFileElementType; +import com.notzippy.intellij.go.grammar.psi.GoMethodSpec; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/index/GoMethodIndex.java b/src/main/java/com/notzippy/intellij/go/stubs/index/GoMethodIndex.java index 8e5bac7ef1..bb1b53eb79 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/index/GoMethodIndex.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/index/GoMethodIndex.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.stubs.index; +package com.notzippy.intellij.go.stubs.index; -import com.goide.GoFileElementType; -import com.goide.psi.GoMethodDeclaration; +import com.notzippy.intellij.go.intellij.GoFileElementType; +import com.notzippy.intellij.go.grammar.psi.GoMethodDeclaration; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/index/GoPackagesIndex.java b/src/main/java/com/notzippy/intellij/go/stubs/index/GoPackagesIndex.java index 862e35c4b5..4c34945ce6 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/index/GoPackagesIndex.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/index/GoPackagesIndex.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.stubs.index; +package com.notzippy.intellij.go.stubs.index; -import com.goide.GoFileElementType; -import com.goide.psi.GoFile; +import com.notzippy.intellij.go.intellij.GoFileElementType; +import com.notzippy.intellij.go.grammar.psi.GoFile; import com.intellij.psi.stubs.StringStubIndexExtension; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/index/GoTypesIndex.java b/src/main/java/com/notzippy/intellij/go/stubs/index/GoTypesIndex.java index 8d715c92f8..67e9f2f95e 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/index/GoTypesIndex.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/index/GoTypesIndex.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.stubs.index; +package com.notzippy.intellij.go.stubs.index; -import com.goide.GoFileElementType; -import com.goide.psi.GoTypeSpec; +import com.notzippy.intellij.go.intellij.GoFileElementType; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoAnonymousFieldDefinitionStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoAnonymousFieldDefinitionStubElementType.java index 0c42fb55cb..b7e07cee22 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoAnonymousFieldDefinitionStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoAnonymousFieldDefinitionStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoAnonymousFieldDefinition; -import com.goide.psi.impl.GoAnonymousFieldDefinitionImpl; -import com.goide.stubs.GoAnonymousFieldDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.GoAnonymousFieldDefinition; +import com.notzippy.intellij.go.grammar.psi.impl.GoAnonymousFieldDefinitionImpl; +import com.notzippy.intellij.go.stubs.GoAnonymousFieldDefinitionStub; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoConstDefinitionStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoConstDefinitionStubElementType.java index be2c86b221..e22ce8fa8a 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoConstDefinitionStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoConstDefinitionStubElementType.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoConstDefinition; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.impl.GoConstDefinitionImpl; -import com.goide.stubs.GoConstDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.GoConstDefinition; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.impl.GoConstDefinitionImpl; +import com.notzippy.intellij.go.stubs.GoConstDefinitionStub; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoConstSpecStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoConstSpecStubElementType.java index d60161728b..bccfc34164 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoConstSpecStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoConstSpecStubElementType.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoConstSpec; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.impl.GoConstSpecImpl; -import com.goide.stubs.GoConstSpecStub; +import com.notzippy.intellij.go.grammar.psi.GoConstSpec; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.impl.GoConstSpecImpl; +import com.notzippy.intellij.go.stubs.GoConstSpecStub; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoFieldDefinitionStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoFieldDefinitionStubElementType.java index 921d7c63cb..d75b805f12 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoFieldDefinitionStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoFieldDefinitionStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoFieldDefinition; -import com.goide.psi.impl.GoFieldDefinitionImpl; -import com.goide.stubs.GoFieldDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.GoFieldDefinition; +import com.notzippy.intellij.go.grammar.psi.impl.GoFieldDefinitionImpl; +import com.notzippy.intellij.go.stubs.GoFieldDefinitionStub; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoFunctionDeclarationStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoFunctionDeclarationStubElementType.java index fad3b4382f..e478adbb36 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoFunctionDeclarationStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoFunctionDeclarationStubElementType.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoNamedElement; -import com.goide.psi.impl.GoFunctionDeclarationImpl; -import com.goide.stubs.GoFunctionDeclarationStub; -import com.goide.stubs.index.GoFunctionIndex; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.impl.GoFunctionDeclarationImpl; +import com.notzippy.intellij.go.stubs.GoFunctionDeclarationStub; +import com.notzippy.intellij.go.stubs.index.GoFunctionIndex; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubIndexKey; import com.intellij.psi.stubs.StubInputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoImportSpecStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoImportSpecStubElementType.java index 9a491869ca..2147d9b039 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoImportSpecStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoImportSpecStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoImportSpec; -import com.goide.psi.impl.GoImportSpecImpl; -import com.goide.stubs.GoImportSpecStub; +import com.notzippy.intellij.go.grammar.psi.GoImportSpec; +import com.notzippy.intellij.go.grammar.psi.impl.GoImportSpecImpl; +import com.notzippy.intellij.go.stubs.GoImportSpecStub; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.stubs.StubElement; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoLabelDefinitionStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoLabelDefinitionStubElementType.java index d522c4a59c..dee1822586 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoLabelDefinitionStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoLabelDefinitionStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoLabelDefinition; -import com.goide.psi.impl.GoLabelDefinitionImpl; -import com.goide.stubs.GoLabelDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.GoLabelDefinition; +import com.notzippy.intellij.go.grammar.psi.impl.GoLabelDefinitionImpl; +import com.notzippy.intellij.go.stubs.GoLabelDefinitionStub; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoMethodDeclarationStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoMethodDeclarationStubElementType.java index 6df03746c1..3300a7a814 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoMethodDeclarationStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoMethodDeclarationStubElementType.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoMethodDeclaration; -import com.goide.psi.GoTypeReferenceExpression; -import com.goide.psi.impl.GoMethodDeclarationImpl; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.stubs.GoFileStub; -import com.goide.stubs.GoMethodDeclarationStub; -import com.goide.stubs.index.GoMethodIndex; +import com.notzippy.intellij.go.grammar.psi.GoMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoTypeReferenceExpression; +import com.notzippy.intellij.go.grammar.psi.impl.GoMethodDeclarationImpl; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.stubs.GoFileStub; +import com.notzippy.intellij.go.stubs.GoMethodDeclarationStub; +import com.notzippy.intellij.go.stubs.index.GoMethodIndex; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.stubs.IndexSink; import com.intellij.psi.stubs.StubElement; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoMethodSpecStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoMethodSpecStubElementType.java index 63f4e61e0b..d384c63d97 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoMethodSpecStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoMethodSpecStubElementType.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoMethodSpec; -import com.goide.psi.impl.GoMethodSpecImpl; -import com.goide.psi.impl.GoPsiImplUtil; -import com.goide.stubs.GoMethodSpecStub; -import com.goide.stubs.index.GoMethodFingerprintIndex; +import com.notzippy.intellij.go.grammar.psi.GoMethodSpec; +import com.notzippy.intellij.go.grammar.psi.impl.GoMethodSpecImpl; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; +import com.notzippy.intellij.go.stubs.GoMethodSpecStub; +import com.notzippy.intellij.go.stubs.index.GoMethodFingerprintIndex; import com.intellij.psi.stubs.IndexSink; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoNamedStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoNamedStubElementType.java index 34a09aa476..93b8411aea 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoNamedStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoNamedStubElementType.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoNamedElement; -import com.goide.stubs.GoFileStub; -import com.goide.stubs.GoNamedStub; -import com.goide.stubs.index.GoAllPrivateNamesIndex; -import com.goide.stubs.index.GoAllPublicNamesIndex; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.stubs.GoFileStub; +import com.notzippy.intellij.go.stubs.GoNamedStub; +import com.notzippy.intellij.go.stubs.index.GoAllPrivateNamesIndex; +import com.notzippy.intellij.go.stubs.index.GoAllPublicNamesIndex; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoPackageClauseStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoPackageClauseStubElementType.java index e9c2714f8e..c56168a54c 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoPackageClauseStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoPackageClauseStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoPackageClause; -import com.goide.psi.impl.GoPackageClauseImpl; -import com.goide.stubs.GoPackageClauseStub; +import com.notzippy.intellij.go.grammar.psi.GoPackageClause; +import com.notzippy.intellij.go.grammar.psi.impl.GoPackageClauseImpl; +import com.notzippy.intellij.go.stubs.GoPackageClauseStub; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoParamDefinitionStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoParamDefinitionStubElementType.java index 92609353ca..564e0aa674 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoParamDefinitionStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoParamDefinitionStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoParamDefinition; -import com.goide.psi.impl.GoParamDefinitionImpl; -import com.goide.stubs.GoParamDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.GoParamDefinition; +import com.notzippy.intellij.go.grammar.psi.impl.GoParamDefinitionImpl; +import com.notzippy.intellij.go.stubs.GoParamDefinitionStub; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoParameterDeclarationStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoParameterDeclarationStubElementType.java index 7fded3bb3f..b3010d333d 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoParameterDeclarationStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoParameterDeclarationStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoParameterDeclaration; -import com.goide.psi.impl.GoParameterDeclarationImpl; -import com.goide.stubs.GoParameterDeclarationStub; +import com.notzippy.intellij.go.grammar.psi.GoParameterDeclaration; +import com.notzippy.intellij.go.grammar.psi.impl.GoParameterDeclarationImpl; +import com.notzippy.intellij.go.stubs.GoParameterDeclarationStub; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoParametersStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoParametersStubElementType.java index 6400b8d01e..dad9eff802 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoParametersStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoParametersStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoParameters; -import com.goide.psi.impl.GoParametersImpl; -import com.goide.stubs.GoParametersStub; +import com.notzippy.intellij.go.grammar.psi.GoParameters; +import com.notzippy.intellij.go.grammar.psi.impl.GoParametersImpl; +import com.notzippy.intellij.go.stubs.GoParametersStub; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoReceiverStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoReceiverStubElementType.java index 73ec86d8ae..a4f0fd02b0 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoReceiverStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoReceiverStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoReceiver; -import com.goide.psi.impl.GoReceiverImpl; -import com.goide.stubs.GoReceiverStub; +import com.notzippy.intellij.go.grammar.psi.GoReceiver; +import com.notzippy.intellij.go.grammar.psi.impl.GoReceiverImpl; +import com.notzippy.intellij.go.stubs.GoReceiverStub; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.stubs.StubElement; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoResultStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoResultStubElementType.java index 20902f2711..44fbe84e61 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoResultStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoResultStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoResult; -import com.goide.psi.impl.GoResultImpl; -import com.goide.stubs.GoResultStub; +import com.notzippy.intellij.go.grammar.psi.GoResult; +import com.notzippy.intellij.go.grammar.psi.impl.GoResultImpl; +import com.notzippy.intellij.go.stubs.GoResultStub; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoSignatureStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoSignatureStubElementType.java index e84442f2d8..4e6da8827e 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoSignatureStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoSignatureStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoSignature; -import com.goide.psi.impl.GoSignatureImpl; -import com.goide.stubs.GoSignatureStub; +import com.notzippy.intellij.go.grammar.psi.GoSignature; +import com.notzippy.intellij.go.grammar.psi.impl.GoSignatureImpl; +import com.notzippy.intellij.go.stubs.GoSignatureStub; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoStubElementType.java index f33ad5539d..b41f2191b3 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.GoLanguage; -import com.goide.psi.GoBlock; -import com.goide.psi.GoCompositeElement; +import com.notzippy.intellij.go.intellij.GoLanguage; +import com.notzippy.intellij.go.grammar.psi.GoBlock; +import com.notzippy.intellij.go.grammar.psi.GoCompositeElement; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.IndexSink; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoTypeSpecStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoTypeSpecStubElementType.java index 156e953c89..977144901c 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoTypeSpecStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoTypeSpecStubElementType.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoNamedElement; -import com.goide.psi.GoTypeSpec; -import com.goide.psi.impl.GoTypeSpecImpl; -import com.goide.stubs.GoTypeSpecStub; -import com.goide.stubs.index.GoTypesIndex; +import com.notzippy.intellij.go.grammar.psi.GoNamedElement; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeSpecImpl; +import com.notzippy.intellij.go.stubs.GoTypeSpecStub; +import com.notzippy.intellij.go.stubs.index.GoTypesIndex; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubIndexKey; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoTypeStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoTypeStubElementType.java index 3313a9069b..200264d0cf 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoTypeStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoTypeStubElementType.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoType; -import com.goide.psi.GoTypeSpec; -import com.goide.stubs.GoTypeStub; +import com.notzippy.intellij.go.grammar.psi.GoType; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; +import com.notzippy.intellij.go.stubs.GoTypeStub; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoVarDefinitionStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoVarDefinitionStubElementType.java index 2beaff39ac..e2b01078eb 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoVarDefinitionStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoVarDefinitionStubElementType.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.GoVarDefinition; -import com.goide.psi.impl.GoVarDefinitionImpl; -import com.goide.stubs.GoVarDefinitionStub; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoVarDefinition; +import com.notzippy.intellij.go.grammar.psi.impl.GoVarDefinitionImpl; +import com.notzippy.intellij.go.stubs.GoVarDefinitionStub; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; diff --git a/src/main/java/com/notzippy/intellij/go/stubs/types/GoVarSpecStubElementType.java b/src/main/java/com/notzippy/intellij/go/stubs/types/GoVarSpecStubElementType.java index e08995ccc8..fc60fb1ca6 100644 --- a/src/main/java/com/notzippy/intellij/go/stubs/types/GoVarSpecStubElementType.java +++ b/src/main/java/com/notzippy/intellij/go/stubs/types/GoVarSpecStubElementType.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.stubs.types; +package com.notzippy.intellij.go.stubs.types; -import com.goide.GoTypes; -import com.goide.psi.GoFunctionOrMethodDeclaration; -import com.goide.psi.GoVarSpec; -import com.goide.psi.impl.GoVarSpecImpl; -import com.goide.stubs.GoVarSpecStub; +import com.notzippy.intellij.go.parser.GoTypes; +import com.notzippy.intellij.go.grammar.psi.GoFunctionOrMethodDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoVarSpec; +import com.notzippy.intellij.go.grammar.psi.impl.GoVarSpecImpl; +import com.notzippy.intellij.go.stubs.GoVarSpecStub; import com.intellij.lang.ASTNode; import com.intellij.psi.stubs.StubElement; import com.intellij.psi.stubs.StubInputStream; diff --git a/src/main/resources/META-INF/app-engine.xml b/src/main/resources/META-INF/app-engine.xml index e2579205a4..8986eb80ce 100644 --- a/src/main/resources/META-INF/app-engine.xml +++ b/src/main/resources/META-INF/app-engine.xml @@ -15,18 +15,18 @@ --> - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/main/resources/META-INF/coverage.xml b/src/main/resources/META-INF/coverage.xml index 9674332b81..5d196de67f 100644 --- a/src/main/resources/META-INF/coverage.xml +++ b/src/main/resources/META-INF/coverage.xml @@ -1,9 +1,9 @@ - - - - - - - - + + + + + + + + diff --git a/src/main/resources/META-INF/gogland.xml b/src/main/resources/META-INF/gogland.xml index e8a4eac564..65a7332bd3 100644 --- a/src/main/resources/META-INF/gogland.xml +++ b/src/main/resources/META-INF/gogland.xml @@ -15,353 +15,353 @@ --> - + - + - com.goide.project.GoModuleLibrariesInitializer + com.notzippy.intellij.go.intellij.project.GoModuleLibrariesInitializer - - - - - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - + + - - - + + - - - + + + - + - - + + - - - - + + + + - - - - - - - + + + + + + + - + - + - + - com.goide.GoBundle + com.notzippy.intellij.go.goide.GoBundle go.intentions.category - com.goide.intentions.GoAddFunctionBlockIntention + com.notzippy.intellij.go.intellij.intentions.GoAddFunctionBlockIntention - com.goide.GoBundle + com.notzippy.intellij.go.goide.GoBundle go.intentions.category - com.goide.intentions.GoMoveToStructInitializationIntention + com.notzippy.intellij.go.intellij.intentions.GoMoveToStructInitializationIntention + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoUnusedImportInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedLabelInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedVariableInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedConstInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedGlobalVariableInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedExportedFunctionInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedFunctionInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedParameterInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoBoolExpressionsInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoEmptyDeclarationInspection" cleanupTool="true"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoRedundantSecondIndexInSlicesInspection" cleanupTool="true"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoRedundantBlankArgInRangeInspection" cleanupTool="true"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoRedundantTypeDeclInCompositeLit" cleanupTool="true"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoDuplicateFieldsOrMethodsInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoDuplicateFunctionOrMethodInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoDuplicateArgumentInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoDuplicateReturnArgumentInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoRedeclareImportAsFunctionInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoCommentStartInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoExportedOwnDeclarationInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoStructInitializationInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoReceiverNamesInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoReservedWordUsedAsNameInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoImportUsedAsNameInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoStructTagInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoPlaceholderCountInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoMissingReturnInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoUsedAsValueInCondition"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoInfiniteForInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoDeferInLoopInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoRangeIterationOnIllegalTypeInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoAssignmentToReceiverInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoDirectAssignToStructFieldInMapInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.unresolved.GoAssignmentToConstantInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoAssignmentNilWithoutExplicitTypeInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoFunctionVariadicParameterInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoVarDeclarationInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoNoNewVariablesInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoFunctionCallInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoDeferGoInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoMultiplePackagesInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoCgoInTestInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoTestSignaturesInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoSelfImportInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoInvalidPackageImportInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoEmbeddedInterfacePointerInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoAddTrailingCommaInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoUnderscoreUsedAsValueInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoInvalidStringOrCharInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoAnonymousFieldDefinitionTypeInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoMixedNamedUnnamedParametersInspection"/> + implementationClass="com.notzippy.intellij.go.intellij.inspections.GoStringAndByteTypeMismatchInspection"/> @@ -369,29 +369,29 @@ - - + - - - - - @@ -402,7 +402,7 @@ - com.goide.ui.ProjectTutorialNotification + com.notzippy.intellij.go.intellij.ui.ProjectTutorialNotification @@ -411,9 +411,9 @@ - org.jetbrains.plugins.yaml - - - + + + + \ No newline at end of file diff --git a/src/main/resources/META-INF/google-app-engine-core-yaml.xml b/src/main/resources/META-INF/google-app-engine-core-yaml.xml index e780604a7c..aa1abbedc3 100644 --- a/src/main/resources/META-INF/google-app-engine-core-yaml.xml +++ b/src/main/resources/META-INF/google-app-engine-core-yaml.xml @@ -15,8 +15,8 @@ --> - - - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/src/main/resources/META-INF/java-deps.xml b/src/main/resources/META-INF/java-deps.xml index 1e9a34cac5..9243da3cc0 100644 --- a/src/main/resources/META-INF/java-deps.xml +++ b/src/main/resources/META-INF/java-deps.xml @@ -16,13 +16,14 @@ - - - + + + - + - + diff --git a/src/main/resources/META-INF/plan9.xml b/src/main/resources/META-INF/plan9.xml index 261e61240e..9461c58303 100644 --- a/src/main/resources/META-INF/plan9.xml +++ b/src/main/resources/META-INF/plan9.xml @@ -14,14 +14,14 @@ ~ limitations under the License. --> - - - - + + + + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml new file mode 100644 index 0000000000..d8500783d4 --- /dev/null +++ b/src/main/resources/META-INF/plugin.xml @@ -0,0 +1,47 @@ + + nz.golang-plugin + Go Lang + Notzippy + + + Ported from https://github.com/go-lang-plugin-org/go-lang-idea-plugin + ]]> + + + + com.intellij.modules.lang + com.intellij.modules.java + com.intellij.modules.coverage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/com/goide/GoCodeInsightFixtureTestCase.java b/src/test/java/com/notzippy/intellij/go/GoCodeInsightFixtureTestCase.java similarity index 88% rename from tests/com/goide/GoCodeInsightFixtureTestCase.java rename to src/test/java/com/notzippy/intellij/go/GoCodeInsightFixtureTestCase.java index 028ee3efbd..3affddbbb7 100644 --- a/tests/com/goide/GoCodeInsightFixtureTestCase.java +++ b/src/test/java/com/notzippy/intellij/go/GoCodeInsightFixtureTestCase.java @@ -14,12 +14,15 @@ * limitations under the License. */ -package com.goide; - -import com.goide.project.GoApplicationLibrariesService; -import com.goide.project.GoBuildTargetSettings; -import com.goide.project.GoModuleSettings; -import com.goide.sdk.GoSdkType; +package com.notzippy.intellij.go; + +import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil; +import com.notzippy.intellij.go.intellij.project.GoApplicationLibrariesService; +import com.notzippy.intellij.go.intellij.project.GoBuildTargetSettings; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.sdk.GoSdkType; +import com.notzippy.intellij.go.intellij.GoFileElementType; +import com.notzippy.intellij.go.intellij.GoModuleType; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.SelectionModel; @@ -54,6 +57,10 @@ import java.util.List; abstract public class GoCodeInsightFixtureTestCase extends LightPlatformCodeInsightFixtureTestCase { + + public static final String GO_TEST_SDK_VERSION = "1.1.2"; + public static final String GO_TEST_SDK = "Go " + GO_TEST_SDK_VERSION; + protected static String buildStubTreeText(@NotNull Project project, @NotNull VirtualFile file, @NotNull String fileContent, @@ -65,7 +72,7 @@ protected static String buildStubTreeText(@NotNull Project project, } String full = DebugUtil.stubTreeToString(GoFileElementType.INSTANCE.getBuilder().buildStubTree(psi)); psi.putUserData(IndexingDataKeys.VIRTUAL_FILE, file); - FileContentImpl content = new FileContentImpl(file, fileContent, file.getCharset()); + FileContentImpl content = new FileContentImpl(file, fileContent, 0); PsiFile psiFile = content.getPsiFile(); String fast = DebugUtil.stubTreeToString(GoFileElementType.INSTANCE.getBuilder().buildStubTree(psiFile)); if (!Comparing.strEqual(full, fast)) { @@ -104,6 +111,11 @@ protected void tearDown() throws Exception { GoApplicationLibrariesService.getInstance().setLibraryRootUrls(); GoModuleSettings.getInstance(myFixture.getModule()).setBuildTargetSettings(new GoBuildTargetSettings()); GoModuleSettings.getInstance(myFixture.getModule()).setVendoringEnabled(ThreeState.UNSURE); + Sdk old = ProjectJdkTable.getInstance().findJdk(GO_TEST_SDK); + if (old != null) { + SdkConfigurationUtil.removeSdk(old); + } + } finally { //noinspection ThrowFromFinallyBlock @@ -128,7 +140,7 @@ private static DefaultLightProjectDescriptor createMockProjectDescriptor() { @NotNull @Override public Sdk getSdk() { - return createMockSdk("1.1.2"); + return createMockSdk(GO_TEST_SDK_VERSION); } @NotNull @@ -151,7 +163,7 @@ private void setUpProjectSdk() { private static Sdk createMockSdk(@NotNull String version) { String homePath = new File("testData/mockSdk-" + version + "/").getAbsolutePath(); GoSdkType sdkType = GoSdkType.getInstance(); - ProjectJdkImpl sdk = new ProjectJdkImpl("Go " + version, sdkType, homePath, version); + ProjectJdkImpl sdk = new ProjectJdkImpl(GO_TEST_SDK, sdkType, homePath, version); sdkType.setupSdkPaths(sdk); sdk.setVersionString(version); return sdk; diff --git a/tests/com/goide/GoDocumentationProviderTest.java b/src/test/java/com/notzippy/intellij/go/GoDocumentationProviderTest.java similarity index 97% rename from tests/com/goide/GoDocumentationProviderTest.java rename to src/test/java/com/notzippy/intellij/go/GoDocumentationProviderTest.java index e3acc6109a..54ce103dc6 100644 --- a/tests/com/goide/GoDocumentationProviderTest.java +++ b/src/test/java/com/notzippy/intellij/go/GoDocumentationProviderTest.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go; +import com.notzippy.intellij.go.intellij.GoCommentsConverter; +import com.notzippy.intellij.go.intellij.GoDocumentationProvider; import com.intellij.codeInsight.documentation.DocumentationManager; import com.intellij.lang.documentation.DocumentationProvider; import com.intellij.openapi.editor.Editor; diff --git a/tests/com/goide/GoFindUsageTest.java b/src/test/java/com/notzippy/intellij/go/GoFindUsageTest.java similarity index 98% rename from tests/com/goide/GoFindUsageTest.java rename to src/test/java/com/notzippy/intellij/go/GoFindUsageTest.java index 4aad89306f..550bbd2e34 100644 --- a/tests/com/goide/GoFindUsageTest.java +++ b/src/test/java/com/notzippy/intellij/go/GoFindUsageTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go; -import com.goide.psi.GoStatement; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.grammar.psi.GoStatement; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFileFilter; import com.intellij.psi.PsiElement; diff --git a/tests/com/goide/GoParametrizedTestBase.java b/src/test/java/com/notzippy/intellij/go/GoParametrizedTestBase.java similarity index 98% rename from tests/com/goide/GoParametrizedTestBase.java rename to src/test/java/com/notzippy/intellij/go/GoParametrizedTestBase.java index e487c0cc23..8efdca1978 100644 --- a/tests/com/goide/GoParametrizedTestBase.java +++ b/src/test/java/com/notzippy/intellij/go/GoParametrizedTestBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go; import com.intellij.testFramework.EdtTestUtil; import com.intellij.testFramework.TestRunnerUtil; diff --git a/tests/com/goide/GoPerformanceTest.java b/src/test/java/com/notzippy/intellij/go/GoPerformanceTest.java similarity index 81% rename from tests/com/goide/GoPerformanceTest.java rename to src/test/java/com/notzippy/intellij/go/GoPerformanceTest.java index 52e0948055..d1278ac345 100644 --- a/tests/com/goide/GoPerformanceTest.java +++ b/src/test/java/com/notzippy/intellij/go/GoPerformanceTest.java @@ -14,14 +14,16 @@ * limitations under the License. */ -package com.goide; - -import com.goide.categories.Performance; -import com.goide.completion.GoCompletionUtil; -import com.goide.inspections.GoUnusedImportInspection; -import com.goide.inspections.unresolved.*; -import com.goide.project.GoBuildTargetSettings; -import com.goide.project.GoModuleSettings; +package com.notzippy.intellij.go; + +import com.intellij.testFramework.InspectionsKt; +import com.notzippy.intellij.go.intellij.categories.Performance; +import com.notzippy.intellij.go.intellij.completion.GoCompletionUtil; +import com.notzippy.intellij.go.intellij.inspections.GoUnusedImportInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.*; +import com.notzippy.intellij.go.intellij.project.GoBuildTargetSettings; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.GoFileType; import com.intellij.analysis.AnalysisScope; import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInspection.InspectionManager; @@ -44,6 +46,7 @@ import java.io.File; import java.io.IOException; +import java.util.Collections; import java.util.concurrent.TimeUnit; @Category(Performance.class) @@ -114,12 +117,12 @@ private void doCompletionTest(@NotNull String source, int invocationCount, long myFixture.configureByText(GoFileType.INSTANCE, source); PlatformTestUtil.startPerformanceTest(getTestName(true), (int)expectation, - () -> myFixture.complete(CompletionType.BASIC, invocationCount)).cpuBound().usesAllCPUCores().assertTiming(); + () -> myFixture.complete(CompletionType.BASIC, invocationCount)).usesAllCPUCores().assertTiming(); } private void doHighlightingTest(long expectation) { PlatformTestUtil.startPerformanceTest(getTestName(true), (int)expectation, - () -> myFixture.testHighlighting(true, false, false, getTestName(true) + ".go")).cpuBound().usesAllCPUCores().assertTiming(); + () -> myFixture.testHighlighting(true, false, false, getTestName(true) + ".go")).usesAllCPUCores().assertTiming(); } private void doInspectionTest(@NotNull InspectionProfileEntry tool, long expected) { @@ -130,13 +133,15 @@ private void doInspectionTest(@NotNull InspectionProfileEntry tool, long expecte scope.invalidate(); - InspectionManagerEx inspectionManager = (InspectionManagerEx)InspectionManager.getInstance(getProject()); - InspectionToolWrapper wrapper = InspectionToolRegistrar.wrapTool(tool); + InspectionToolWrapper toolWrapper = InspectionToolRegistrar.wrapTool(tool); +// InspectionManagerEx inspectionManager = (InspectionManagerEx)InspectionManager.getInstance(getProject()); +// GlobalInspectionContextForTests globalContext = +// CodeInsightTestFixtureImpl.createGlobalContextForTool(scope, getProject(), inspectionManager, wrapper); GlobalInspectionContextForTests globalContext = - CodeInsightTestFixtureImpl.createGlobalContextForTool(scope, getProject(), inspectionManager, wrapper); + InspectionsKt.createGlobalContextForTool(scope, getProject(), Collections.>singletonList(toolWrapper)); - PlatformTestUtil.startPerformanceTest(getTestName(true), (int)expected, () -> InspectionTestUtil.runTool(wrapper, scope, globalContext)).cpuBound().usesAllCPUCores().assertTiming(); - InspectionTestUtil.compareToolResults(globalContext, wrapper, false, new File(getTestDataPath(), wrapper.getShortName()).getPath()); + PlatformTestUtil.startPerformanceTest(getTestName(true), (int)expected, () -> InspectionTestUtil.runTool(toolWrapper, scope, globalContext)).usesAllCPUCores().assertTiming(); + InspectionTestUtil.compareToolResults(globalContext, toolWrapper, false, new File(getTestDataPath(), toolWrapper.getShortName()).getPath()); } @Nullable diff --git a/tests/com/goide/GoSdkServiceTest.java b/src/test/java/com/notzippy/intellij/go/GoSdkServiceTest.java similarity index 98% rename from tests/com/goide/GoSdkServiceTest.java rename to src/test/java/com/notzippy/intellij/go/GoSdkServiceTest.java index 3583b78d48..3684808d00 100644 --- a/tests/com/goide/GoSdkServiceTest.java +++ b/src/test/java/com/notzippy/intellij/go/GoSdkServiceTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; diff --git a/tests/com/goide/SdkAware.java b/src/test/java/com/notzippy/intellij/go/SdkAware.java similarity index 95% rename from tests/com/goide/SdkAware.java rename to src/test/java/com/notzippy/intellij/go/SdkAware.java index 3c4f75d145..fb6412226d 100644 --- a/tests/com/goide/SdkAware.java +++ b/src/test/java/com/notzippy/intellij/go/SdkAware.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide; +package com.notzippy.intellij.go; import java.lang.annotation.*; diff --git a/tests/com/goide/actions/GoCreateFileActionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/actions/GoCreateFileActionTest.java similarity index 96% rename from tests/com/goide/actions/GoCreateFileActionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/actions/GoCreateFileActionTest.java index 04421dbf19..d2e18a47fe 100644 --- a/tests/com/goide/actions/GoCreateFileActionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/actions/GoCreateFileActionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.actions; +package com.notzippy.intellij.go.intellij.actions; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.psi.GoFile; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoFile; import com.intellij.ide.actions.CreateFileFromTemplateAction; import com.intellij.ide.fileTemplates.impl.CustomFileTemplate; import com.intellij.openapi.command.WriteCommandAction; diff --git a/src/test/java/com/notzippy/intellij/go/intellij/categories/Performance.java b/src/test/java/com/notzippy/intellij/go/intellij/categories/Performance.java new file mode 100644 index 0000000000..48260b7a84 --- /dev/null +++ b/src/test/java/com/notzippy/intellij/go/intellij/categories/Performance.java @@ -0,0 +1,3 @@ +package com.notzippy.intellij.go.intellij.categories; + +public interface Performance {} diff --git a/tests/com/goide/codeInsight/imports/GoImportOptimizerTest.java b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportOptimizerTest.java similarity index 94% rename from tests/com/goide/codeInsight/imports/GoImportOptimizerTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportOptimizerTest.java index 295a5fe5a0..b000ac16ce 100644 --- a/tests/com/goide/codeInsight/imports/GoImportOptimizerTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoImportOptimizerTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.codeInsight.imports; +package com.notzippy.intellij.go.intellij.codeInsight.imports; -import com.goide.SdkAware; -import com.goide.inspections.GoUnusedImportInspection; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.inspections.GoUnusedImportInspection; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import com.intellij.codeInsight.actions.OptimizeImportsAction; import com.intellij.ide.DataManager; import com.intellij.openapi.application.ApplicationManager; diff --git a/tests/com/goide/codeInsight/imports/GoReferenceImporterTest.java b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoReferenceImporterTest.java similarity index 96% rename from tests/com/goide/codeInsight/imports/GoReferenceImporterTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoReferenceImporterTest.java index c45f3106dc..4868dc7d75 100644 --- a/tests/com/goide/codeInsight/imports/GoReferenceImporterTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/imports/GoReferenceImporterTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.codeInsight.imports; +package com.notzippy.intellij.go.intellij.codeInsight.imports; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.SdkAware; -import com.goide.inspections.unresolved.GoUnresolvedReferenceInspection; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/tests/com/goide/codeInsight/unwrap/GoBracesUnwrapperTest.java b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoBracesUnwrapperTest.java similarity index 95% rename from tests/com/goide/codeInsight/unwrap/GoBracesUnwrapperTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoBracesUnwrapperTest.java index e30ddf3801..30029f5013 100644 --- a/tests/com/goide/codeInsight/unwrap/GoBracesUnwrapperTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoBracesUnwrapperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; public class GoBracesUnwrapperTest extends GoUnwrapTestCase { public void testNoActionFor() { diff --git a/tests/com/goide/codeInsight/unwrap/GoElseRemoverTest.java b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseRemoverTest.java similarity index 95% rename from tests/com/goide/codeInsight/unwrap/GoElseRemoverTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseRemoverTest.java index c337b8f15e..8b7ea7be7f 100644 --- a/tests/com/goide/codeInsight/unwrap/GoElseRemoverTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseRemoverTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; public class GoElseRemoverTest extends GoUnwrapTestCase { public void testNoAction() { diff --git a/tests/com/goide/codeInsight/unwrap/GoElseUnwrapperTest.java b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapperTest.java similarity index 95% rename from tests/com/goide/codeInsight/unwrap/GoElseUnwrapperTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapperTest.java index 8c7aa6c7d1..24c4dd0e9b 100644 --- a/tests/com/goide/codeInsight/unwrap/GoElseUnwrapperTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoElseUnwrapperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; public class GoElseUnwrapperTest extends GoUnwrapTestCase { public void testNoAction() { diff --git a/tests/com/goide/codeInsight/unwrap/GoForUnwrapperTest.java b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoForUnwrapperTest.java similarity index 96% rename from tests/com/goide/codeInsight/unwrap/GoForUnwrapperTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoForUnwrapperTest.java index 79d84ce582..0351930c76 100644 --- a/tests/com/goide/codeInsight/unwrap/GoForUnwrapperTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoForUnwrapperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; public class GoForUnwrapperTest extends GoUnwrapTestCase { public void testVoidFor() { diff --git a/tests/com/goide/codeInsight/unwrap/GoFunctionArgumentUnwrapperTest.java b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoFunctionArgumentUnwrapperTest.java similarity index 94% rename from tests/com/goide/codeInsight/unwrap/GoFunctionArgumentUnwrapperTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoFunctionArgumentUnwrapperTest.java index a517e56790..a8c752ec8a 100644 --- a/tests/com/goide/codeInsight/unwrap/GoFunctionArgumentUnwrapperTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoFunctionArgumentUnwrapperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; public class GoFunctionArgumentUnwrapperTest extends GoUnwrapTestCase { public void testNoAction() { diff --git a/tests/com/goide/codeInsight/unwrap/GoIfUnwrapperTest.java b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoIfUnwrapperTest.java similarity index 96% rename from tests/com/goide/codeInsight/unwrap/GoIfUnwrapperTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoIfUnwrapperTest.java index 641f847eb8..8473a0d076 100644 --- a/tests/com/goide/codeInsight/unwrap/GoIfUnwrapperTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoIfUnwrapperTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; public class GoIfUnwrapperTest extends GoUnwrapTestCase { public void testNoAction() { diff --git a/tests/com/goide/codeInsight/unwrap/GoUnwrapTestCase.java b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapTestCase.java similarity index 77% rename from tests/com/goide/codeInsight/unwrap/GoUnwrapTestCase.java rename to src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapTestCase.java index 38fb1b36e5..befd669ee6 100644 --- a/tests/com/goide/codeInsight/unwrap/GoUnwrapTestCase.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/codeInsight/unwrap/GoUnwrapTestCase.java @@ -14,16 +14,18 @@ * limitations under the License. */ -package com.goide.codeInsight.unwrap; +package com.notzippy.intellij.go.intellij.codeInsight.unwrap; -import com.goide.GoCodeInsightFixtureTestCase; +import com.intellij.openapi.actionSystem.*; +import com.intellij.ui.components.BasicOptionButtonUI; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.codeInsight.unwrap.UnwrapHandler; -import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import java.awt.event.ActionEvent; import java.util.List; import java.util.stream.Collectors; @@ -36,9 +38,9 @@ protected void assertUnwrapped(@NotNull String codeBefore, @NotNull String codeA myFixture.configureByText("a.go", normalizeCode(codeBefore)); UnwrapHandler h = new UnwrapHandler() { @Override - protected void selectOption(List options, Editor editor, PsiFile file) { + protected void selectOption(List options, Editor editor, PsiFile file) { if (options.isEmpty()) return; - options.get(option).actionPerformed(null); + options.get(option).actionPerformed(new AnActionEvent(null, DataContext.EMPTY_CONTEXT,"", new Presentation(), ActionManager.getInstance(),0)); } }; h.invoke(getProject(), myFixture.getEditor(), myFixture.getFile()); @@ -50,7 +52,7 @@ protected void assertOptions(@NotNull String code, String... expectedOptions) { List actualOptions = ContainerUtil.newArrayList(); UnwrapHandler h = new UnwrapHandler() { @Override - protected void selectOption(List options, Editor editor, PsiFile file) { + protected void selectOption(List options, Editor editor, PsiFile file) { actualOptions.addAll(options.stream().map(each -> each.getTemplatePresentation().getText()).collect(Collectors.toList())); } }; diff --git a/tests/com/goide/completion/GoCompletionSdkAwareTest.java b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoCompletionSdkAwareTest.java similarity index 99% rename from tests/com/goide/completion/GoCompletionSdkAwareTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/completion/GoCompletionSdkAwareTest.java index c0ce6ae0fa..35b55cd371 100644 --- a/tests/com/goide/completion/GoCompletionSdkAwareTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoCompletionSdkAwareTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.SdkAware; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.Lookup; import com.intellij.psi.PsiFile; diff --git a/tests/com/goide/completion/GoCompletionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoCompletionTest.java similarity index 99% rename from tests/com/goide/completion/GoCompletionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/completion/GoCompletionTest.java index 1cfdb9aae4..3d2cbf8ef2 100644 --- a/tests/com/goide/completion/GoCompletionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoCompletionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; import com.intellij.codeInsight.lookup.Lookup; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/tests/com/goide/completion/GoCompletionTestBase.java b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoCompletionTestBase.java similarity index 97% rename from tests/com/goide/completion/GoCompletionTestBase.java rename to src/test/java/com/notzippy/intellij/go/intellij/completion/GoCompletionTestBase.java index 23fcf7856b..9a34aed031 100644 --- a/tests/com/goide/completion/GoCompletionTestBase.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoCompletionTestBase.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.Lookup; import com.intellij.codeInsight.lookup.LookupElement; diff --git a/tests/com/goide/completion/GoExcludedPackagesTest.java b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoExcludedPackagesTest.java similarity index 90% rename from tests/com/goide/completion/GoExcludedPackagesTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/completion/GoExcludedPackagesTest.java index 27113147d5..9c0072de72 100644 --- a/tests/com/goide/completion/GoExcludedPackagesTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoExcludedPackagesTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; -import com.goide.SdkAware; -import com.goide.project.GoExcludedPathsSettings; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.project.GoExcludedPathsSettings; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/completion/GoTestNameCompletionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoTestNameCompletionTest.java similarity index 99% rename from tests/com/goide/completion/GoTestNameCompletionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/completion/GoTestNameCompletionTest.java index b0bd6231c6..bc926e687f 100644 --- a/tests/com/goide/completion/GoTestNameCompletionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/completion/GoTestNameCompletionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.completion; +package com.notzippy.intellij.go.intellij.completion; import com.intellij.codeInsight.completion.CompletionType; diff --git a/tests/com/goide/coverage/GoCoverageCalculationTest.java b/src/test/java/com/notzippy/intellij/go/intellij/coverage/GoCoverageCalculationTest.java similarity index 92% rename from tests/com/goide/coverage/GoCoverageCalculationTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/coverage/GoCoverageCalculationTest.java index 032aeddd3b..7d03a69f5a 100644 --- a/tests/com/goide/coverage/GoCoverageCalculationTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/coverage/GoCoverageCalculationTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.coverage; +package com.notzippy.intellij.go.intellij.coverage; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.runconfig.testing.coverage.GoCoverageAnnotator; -import com.goide.runconfig.testing.coverage.GoCoverageProjectData; -import com.goide.runconfig.testing.coverage.GoCoverageRunner; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.intellij.runconfig.testing.coverage.GoCoverageAnnotator; +import com.notzippy.intellij.go.intellij.runconfig.testing.coverage.GoCoverageProjectData; +import com.notzippy.intellij.go.intellij.runconfig.testing.coverage.GoCoverageRunner; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/editor/GoBraceMatcherTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoBraceMatcherTest.java similarity index 85% rename from tests/com/goide/editor/GoBraceMatcherTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoBraceMatcherTest.java index 58d9d4338f..2cd738cbf9 100644 --- a/tests/com/goide/editor/GoBraceMatcherTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoBraceMatcherTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.GoFileType; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.intellij.GoFileType; public class GoBraceMatcherTest extends GoCodeInsightFixtureTestCase { public void testCloseParenBeforeOpeningBrace() { diff --git a/tests/com/goide/editor/GoExitPointsHighlightingTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoExitPointsHighlightingTest.java similarity index 97% rename from tests/com/goide/editor/GoExitPointsHighlightingTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoExitPointsHighlightingTest.java index 715926c60e..507c054a55 100644 --- a/tests/com/goide/editor/GoExitPointsHighlightingTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoExitPointsHighlightingTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.SdkAware; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.SdkAware; import com.intellij.codeInsight.highlighting.HighlightUsagesHandler; import com.intellij.codeInsight.highlighting.HighlightUsagesHandlerBase; import com.intellij.psi.PsiElement; diff --git a/tests/com/goide/editor/GoFoldingBuilderTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoFoldingBuilderTest.java similarity index 95% rename from tests/com/goide/editor/GoFoldingBuilderTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoFoldingBuilderTest.java index a465cd858a..e203f8a686 100644 --- a/tests/com/goide/editor/GoFoldingBuilderTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoFoldingBuilderTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; public class GoFoldingBuilderTest extends GoCodeInsightFixtureTestCase { diff --git a/tests/com/goide/editor/GoHighlightingAnnotatorTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoHighlightingAnnotatorTest.java similarity index 90% rename from tests/com/goide/editor/GoHighlightingAnnotatorTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoHighlightingAnnotatorTest.java index 625fed5399..7e42187c4d 100644 --- a/tests/com/goide/editor/GoHighlightingAnnotatorTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoHighlightingAnnotatorTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.SdkAware; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.SdkAware; import com.intellij.testFramework.TestDataPath; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/editor/GoLiveTemplateTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoLiveTemplateTest.java similarity index 97% rename from tests/com/goide/editor/GoLiveTemplateTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoLiveTemplateTest.java index ef2c5cb5ed..980018c432 100644 --- a/tests/com/goide/editor/GoLiveTemplateTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoLiveTemplateTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; public class GoLiveTemplateTest extends GoCodeInsightFixtureTestCase { public void testErrOnStatementBeginning() { diff --git a/tests/com/goide/editor/GoParameterInfoHandlerTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoParameterInfoHandlerTest.java similarity index 96% rename from tests/com/goide/editor/GoParameterInfoHandlerTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoParameterInfoHandlerTest.java index 0cc1e6d553..4f7584e1f5 100644 --- a/tests/com/goide/editor/GoParameterInfoHandlerTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoParameterInfoHandlerTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.psi.GoArgumentList; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoArgumentList; import com.intellij.codeInsight.hint.ParameterInfoComponent; import com.intellij.lang.parameterInfo.CreateParameterInfoContext; import com.intellij.lang.parameterInfo.ParameterInfoUIContextEx; diff --git a/tests/com/goide/editor/GoQuoteHandlerTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoQuoteHandlerTest.java similarity index 94% rename from tests/com/goide/editor/GoQuoteHandlerTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoQuoteHandlerTest.java index 766a68ddf9..e9a9b6437c 100644 --- a/tests/com/goide/editor/GoQuoteHandlerTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoQuoteHandlerTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; public class GoQuoteHandlerTest extends GoCodeInsightFixtureTestCase { public void testNewlineInStringLiteral() { diff --git a/tests/com/goide/editor/GoSelectWordTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoSelectWordTest.java similarity index 92% rename from tests/com/goide/editor/GoSelectWordTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoSelectWordTest.java index 27b43a859d..66074cd146 100644 --- a/tests/com/goide/editor/GoSelectWordTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoSelectWordTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/editor/GoSmartEnterTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoSmartEnterTest.java similarity index 94% rename from tests/com/goide/editor/GoSmartEnterTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoSmartEnterTest.java index 74555569f0..c5496696d1 100644 --- a/tests/com/goide/editor/GoSmartEnterTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoSmartEnterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.openapi.actionSystem.IdeActions; public class GoSmartEnterTest extends GoCodeInsightFixtureTestCase { diff --git a/tests/com/goide/editor/GoStatementMoverTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoStatementMoverTest.java similarity index 96% rename from tests/com/goide/editor/GoStatementMoverTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/GoStatementMoverTest.java index f72e3e12f9..c6acc5d581 100644 --- a/tests/com/goide/editor/GoStatementMoverTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/GoStatementMoverTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.editor; +package com.notzippy.intellij.go.intellij.editor; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.openapi.actionSystem.IdeActions; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/editor/surround/GoSurrounderTestBase.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoSurrounderTestBase.java similarity index 92% rename from tests/com/goide/editor/surround/GoSurrounderTestBase.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoSurrounderTestBase.java index ff1bed7a06..ade226bb01 100644 --- a/tests/com/goide/editor/surround/GoSurrounderTestBase.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoSurrounderTestBase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.SdkAware; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.SdkAware; import com.intellij.codeInsight.generation.surroundWith.SurroundWithHandler; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.util.text.StringUtil; diff --git a/tests/com/goide/editor/surround/GoWithBlockSurrounderTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithBlockSurrounderTest.java similarity index 95% rename from tests/com/goide/editor/surround/GoWithBlockSurrounderTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithBlockSurrounderTest.java index 137518b43b..47d5f12bfc 100644 --- a/tests/com/goide/editor/surround/GoWithBlockSurrounderTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithBlockSurrounderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; public class GoWithBlockSurrounderTest extends GoSurrounderTestBase { private static final String SURROUNDER_DESCRIPTION = new GoWithBlockSurrounder().getTemplateDescription(); diff --git a/tests/com/goide/editor/surround/GoWithForSurrounderTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithForSurrounderTest.java similarity index 96% rename from tests/com/goide/editor/surround/GoWithForSurrounderTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithForSurrounderTest.java index 229b490649..ff9b8f253c 100644 --- a/tests/com/goide/editor/surround/GoWithForSurrounderTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithForSurrounderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; public class GoWithForSurrounderTest extends GoSurrounderTestBase { private static final String SURROUNDER_DESCRIPTION = new GoWithForSurrounder().getTemplateDescription(); diff --git a/tests/com/goide/editor/surround/GoWithIfElseExpressionSurrounderTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseExpressionSurrounderTest.java similarity index 95% rename from tests/com/goide/editor/surround/GoWithIfElseExpressionSurrounderTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseExpressionSurrounderTest.java index febf11f0fb..755252d969 100644 --- a/tests/com/goide/editor/surround/GoWithIfElseExpressionSurrounderTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseExpressionSurrounderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; public class GoWithIfElseExpressionSurrounderTest extends GoSurrounderTestBase { private static final String SURROUNDER_DESCRIPTION = new GoWithIfElseExpressionSurrounder().getTemplateDescription(); diff --git a/tests/com/goide/editor/surround/GoWithIfElseSurrounderTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseSurrounderTest.java similarity index 95% rename from tests/com/goide/editor/surround/GoWithIfElseSurrounderTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseSurrounderTest.java index 007675bb35..1201722f8b 100644 --- a/tests/com/goide/editor/surround/GoWithIfElseSurrounderTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfElseSurrounderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; public class GoWithIfElseSurrounderTest extends GoSurrounderTestBase { private static final String SURROUNDER_DESCRIPTION = new GoWithIfElseSurrounder().getTemplateDescription(); diff --git a/tests/com/goide/editor/surround/GoWithIfExpressionSurrounderTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfExpressionSurrounderTest.java similarity index 95% rename from tests/com/goide/editor/surround/GoWithIfExpressionSurrounderTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfExpressionSurrounderTest.java index c49fd1b4ed..556b98c6f5 100644 --- a/tests/com/goide/editor/surround/GoWithIfExpressionSurrounderTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfExpressionSurrounderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; public class GoWithIfExpressionSurrounderTest extends GoSurrounderTestBase { private static final String SURROUNDER_DESCRIPTION = new GoWithIfExpressionSurrounder().getTemplateDescription(); diff --git a/tests/com/goide/editor/surround/GoWithIfSurrounderTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfSurrounderTest.java similarity index 95% rename from tests/com/goide/editor/surround/GoWithIfSurrounderTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfSurrounderTest.java index 0b64acf828..433325d340 100644 --- a/tests/com/goide/editor/surround/GoWithIfSurrounderTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithIfSurrounderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; public class GoWithIfSurrounderTest extends GoSurrounderTestBase { private static final String SURROUNDER_DESCRIPTION = new GoWithIfSurrounder().getTemplateDescription(); diff --git a/tests/com/goide/editor/surround/GoWithNotExpressionSurrounderTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithNotExpressionSurrounderTest.java similarity index 95% rename from tests/com/goide/editor/surround/GoWithNotExpressionSurrounderTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithNotExpressionSurrounderTest.java index cc77d65000..78232dd31b 100644 --- a/tests/com/goide/editor/surround/GoWithNotExpressionSurrounderTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithNotExpressionSurrounderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; public class GoWithNotExpressionSurrounderTest extends GoSurrounderTestBase { private static final String SURROUNDER_DESCRIPTION = new GoWithNotExpressionSurrounder().getTemplateDescription(); diff --git a/tests/com/goide/editor/surround/GoWithParenthesisSurrounderTest.java b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithParenthesisSurrounderTest.java similarity index 95% rename from tests/com/goide/editor/surround/GoWithParenthesisSurrounderTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithParenthesisSurrounderTest.java index 3b4485e6fe..1ee8da23f8 100644 --- a/tests/com/goide/editor/surround/GoWithParenthesisSurrounderTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/editor/surround/GoWithParenthesisSurrounderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.editor.surround; +package com.notzippy.intellij.go.intellij.editor.surround; public class GoWithParenthesisSurrounderTest extends GoSurrounderTestBase { private static final String PARENTHESIS_SURROUNDER = new GoWithParenthesisSurrounder().getTemplateDescription(); diff --git a/tests/com/goide/formatter/GoFormatterTest.java b/src/test/java/com/notzippy/intellij/go/intellij/formatter/GoFormatterTest.java similarity index 95% rename from tests/com/goide/formatter/GoFormatterTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/formatter/GoFormatterTest.java index 5f845b6635..1844e11593 100644 --- a/tests/com/goide/formatter/GoFormatterTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/formatter/GoFormatterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.formatter; +package com.notzippy.intellij.go.intellij.formatter; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.psi.codeStyle.CodeStyleManager; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/generate/GoGenerateTestActionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestActionTest.java similarity index 94% rename from tests/com/goide/generate/GoGenerateTestActionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestActionTest.java index 32b4189f54..73ac09cd8d 100644 --- a/tests/com/goide/generate/GoGenerateTestActionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/generate/GoGenerateTestActionTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.generate; +package com.notzippy.intellij.go.intellij.generate; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.runconfig.testing.GoTestFunctionType; -import com.goide.runconfig.testing.frameworks.gotest.GotestGenerateAction; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.intellij.runconfig.testing.GoTestFunctionType; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GotestGenerateAction; import org.jetbrains.annotations.NotNull; public class GoGenerateTestActionTest extends GoCodeInsightFixtureTestCase { diff --git a/tests/com/goide/highlighting/GoColorsAndFontsPageTest.java b/src/test/java/com/notzippy/intellij/go/intellij/highlighting/GoColorsAndFontsPageTest.java similarity index 92% rename from tests/com/goide/highlighting/GoColorsAndFontsPageTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/highlighting/GoColorsAndFontsPageTest.java index fdc1464eb1..41d8f07f30 100644 --- a/tests/com/goide/highlighting/GoColorsAndFontsPageTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/highlighting/GoColorsAndFontsPageTest.java @@ -1,4 +1,4 @@ -package com.goide.highlighting; +package com.notzippy.intellij.go.intellij.highlighting; import junit.framework.TestCase; import org.junit.Assert; diff --git a/tests/com/goide/inspections/GoAnonymousFieldDefinitionTypeInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoAnonymousFieldDefinitionTypeInspectionTest.java similarity index 85% rename from tests/com/goide/inspections/GoAnonymousFieldDefinitionTypeInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoAnonymousFieldDefinitionTypeInspectionTest.java index 5384f703ef..d411ff06c5 100644 --- a/tests/com/goide/inspections/GoAnonymousFieldDefinitionTypeInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoAnonymousFieldDefinitionTypeInspectionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.quickfix.GoCreateWrapperTypeQuickFix; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.intellij.quickfix.GoCreateWrapperTypeQuickFix; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import org.jetbrains.annotations.NotNull; public class GoAnonymousFieldDefinitionTypeInspectionTest extends GoQuickFixTestBase{ diff --git a/tests/com/goide/inspections/GoAssignmentToReceiverInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentToReceiverInspectionTest.java similarity index 93% rename from tests/com/goide/inspections/GoAssignmentToReceiverInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentToReceiverInspectionTest.java index 55e27abc24..9631baa4b7 100644 --- a/tests/com/goide/inspections/GoAssignmentToReceiverInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoAssignmentToReceiverInspectionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; public class GoAssignmentToReceiverInspectionTest extends GoCodeInsightFixtureTestCase { diff --git a/tests/com/goide/inspections/GoDeferGoInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoDeferGoInspectionTest.java similarity index 91% rename from tests/com/goide/inspections/GoDeferGoInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoDeferGoInspectionTest.java index 9195ef989e..cf537516ad 100644 --- a/tests/com/goide/inspections/GoDeferGoInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoDeferGoInspectionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.SdkAware; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import org.jetbrains.annotations.NotNull; @SdkAware diff --git a/tests/com/goide/inspections/GoEmptyDeclarationInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoEmptyDeclarationInspectionTest.java similarity index 94% rename from tests/com/goide/inspections/GoEmptyDeclarationInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoEmptyDeclarationInspectionTest.java index 820b3de567..060bf60699 100644 --- a/tests/com/goide/inspections/GoEmptyDeclarationInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoEmptyDeclarationInspectionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import org.jetbrains.annotations.NotNull; public class GoEmptyDeclarationInspectionTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/inspections/GoHighlightingTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoHighlightingTest.java similarity index 98% rename from tests/com/goide/inspections/GoHighlightingTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoHighlightingTest.java index 0f1175636a..f86916dd5b 100644 --- a/tests/com/goide/inspections/GoHighlightingTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoHighlightingTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.SdkAware; -import com.goide.codeInsight.imports.GoImportOptimizerTest; -import com.goide.inspections.unresolved.*; -import com.goide.project.GoModuleLibrariesService; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.codeInsight.imports.GoImportOptimizerTest; +import com.notzippy.intellij.go.intellij.inspections.unresolved.*; +import com.notzippy.intellij.go.intellij.project.GoModuleLibrariesService; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; diff --git a/tests/com/goide/inspections/GoInspectionUtilTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionUtilTest.java similarity index 83% rename from tests/com/goide/inspections/GoInspectionUtilTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionUtilTest.java index f90e79ac16..05b98f2ec6 100644 --- a/tests/com/goide/inspections/GoInspectionUtilTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoInspectionUtilTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.psi.GoBuiltinCallExpr; -import com.goide.psi.GoCallExpr; -import com.goide.psi.GoExpression; -import com.goide.psi.GoStringLiteral; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoBuiltinCallExpr; +import com.notzippy.intellij.go.grammar.psi.GoCallExpr; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.GoStringLiteral; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/inspections/GoInvalidPackageImportInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidPackageImportInspectionTest.java similarity index 97% rename from tests/com/goide/inspections/GoInvalidPackageImportInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidPackageImportInspectionTest.java index f6608c6bd2..be82b79880 100644 --- a/tests/com/goide/inspections/GoInvalidPackageImportInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoInvalidPackageImportInspectionTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.SdkAware; -import com.goide.quickfix.GoDeleteImportQuickFix; -import com.goide.quickfix.GoQuickFixTestBase; -import com.goide.sdk.GoSdkService; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteImportQuickFix; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.intellij.sdk.GoSdkService; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.psi.PsiFile; diff --git a/tests/com/goide/inspections/GoReceiverNamesInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoReceiverNamesInspectionTest.java similarity index 91% rename from tests/com/goide/inspections/GoReceiverNamesInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoReceiverNamesInspectionTest.java index 4a7d9976f4..c6e398f3e3 100644 --- a/tests/com/goide/inspections/GoReceiverNamesInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoReceiverNamesInspectionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; public class GoReceiverNamesInspectionTest extends GoCodeInsightFixtureTestCase { diff --git a/tests/com/goide/inspections/GoRedundantBlankArgInRangeInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantBlankArgInRangeInspectionTest.java similarity index 94% rename from tests/com/goide/inspections/GoRedundantBlankArgInRangeInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantBlankArgInRangeInspectionTest.java index 447203bc73..bae754860f 100644 --- a/tests/com/goide/inspections/GoRedundantBlankArgInRangeInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantBlankArgInRangeInspectionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import org.jetbrains.annotations.NotNull; public class GoRedundantBlankArgInRangeInspectionTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/inspections/GoRedundantSecondIndexInSlicesInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantSecondIndexInSlicesInspectionTest.java similarity index 92% rename from tests/com/goide/inspections/GoRedundantSecondIndexInSlicesInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantSecondIndexInSlicesInspectionTest.java index f13767b76b..472b0a0f92 100644 --- a/tests/com/goide/inspections/GoRedundantSecondIndexInSlicesInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantSecondIndexInSlicesInspectionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.SdkAware; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import org.jetbrains.annotations.NotNull; @SdkAware diff --git a/tests/com/goide/inspections/GoRedundantTypeDeclInCompositeLitTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantTypeDeclInCompositeLitTest.java similarity index 96% rename from tests/com/goide/inspections/GoRedundantTypeDeclInCompositeLitTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantTypeDeclInCompositeLitTest.java index dc73145bca..d14ebcd70a 100644 --- a/tests/com/goide/inspections/GoRedundantTypeDeclInCompositeLitTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoRedundantTypeDeclInCompositeLitTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import org.jetbrains.annotations.NotNull; public class GoRedundantTypeDeclInCompositeLitTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/inspections/GoSelfImportInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoSelfImportInspectionTest.java similarity index 92% rename from tests/com/goide/inspections/GoSelfImportInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoSelfImportInspectionTest.java index d0d4053bb2..4db9a3aaac 100644 --- a/tests/com/goide/inspections/GoSelfImportInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoSelfImportInspectionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.quickfix.GoDeleteImportQuickFix; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.intellij.quickfix.GoDeleteImportQuickFix; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import com.intellij.psi.PsiFile; public class GoSelfImportInspectionTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/inspections/GoSpellcheckingTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoSpellcheckingTest.java similarity index 92% rename from tests/com/goide/inspections/GoSpellcheckingTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoSpellcheckingTest.java index e1044998de..f50a52b23b 100644 --- a/tests/com/goide/inspections/GoSpellcheckingTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoSpellcheckingTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.spellchecker.inspections.SpellCheckingInspection; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/inspections/GoStructInitializationInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoStructInitializationInspectionTest.java similarity index 91% rename from tests/com/goide/inspections/GoStructInitializationInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoStructInitializationInspectionTest.java index 0779389a01..957f7b4114 100644 --- a/tests/com/goide/inspections/GoStructInitializationInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoStructInitializationInspectionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.SdkAware; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import org.jetbrains.annotations.NotNull; @SdkAware diff --git a/tests/com/goide/inspections/GoTestSignaturesInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoTestSignaturesInspectionTest.java similarity index 91% rename from tests/com/goide/inspections/GoTestSignaturesInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoTestSignaturesInspectionTest.java index 9a5cd08913..88f19af172 100644 --- a/tests/com/goide/inspections/GoTestSignaturesInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoTestSignaturesInspectionTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.SdkAware; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import org.jetbrains.annotations.NotNull; @SdkAware diff --git a/tests/com/goide/inspections/GoUnusedLabelInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoUnusedLabelInspectionTest.java similarity index 80% rename from tests/com/goide/inspections/GoUnusedLabelInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/GoUnusedLabelInspectionTest.java index 3c15bcb3ac..3545cdf352 100644 --- a/tests/com/goide/inspections/GoUnusedLabelInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/GoUnusedLabelInspectionTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.inspections; +package com.notzippy.intellij.go.intellij.inspections; -import com.goide.inspections.unresolved.GoUnusedLabelInspection; -import com.goide.quickfix.GoQuickFixTestBase; -import com.goide.quickfix.GoRenameToBlankQuickFix; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedLabelInspection; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.intellij.quickfix.GoRenameToBlankQuickFix; public class GoUnusedLabelInspectionTest extends GoQuickFixTestBase { @Override diff --git a/tests/com/goide/inspections/suppression/GoSuppressionFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/inspections/suppression/GoSuppressionFixTest.java similarity index 88% rename from tests/com/goide/inspections/suppression/GoSuppressionFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/inspections/suppression/GoSuppressionFixTest.java index 792b1f62bc..fe6592342e 100644 --- a/tests/com/goide/inspections/suppression/GoSuppressionFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/inspections/suppression/GoSuppressionFixTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.goide.inspections.suppression; - -import com.goide.inspections.GoMultiplePackagesInspection; -import com.goide.inspections.GoUnusedImportInspection; -import com.goide.inspections.unresolved.GoUnresolvedReferenceInspection; -import com.goide.inspections.unresolved.GoUnusedGlobalVariableInspection; -import com.goide.inspections.unresolved.GoUnusedVariableInspection; -import com.goide.quickfix.GoQuickFixTestBase; +package com.notzippy.intellij.go.intellij.inspections.suppression; + +import com.notzippy.intellij.go.intellij.inspections.GoMultiplePackagesInspection; +import com.notzippy.intellij.go.intellij.inspections.GoUnusedImportInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedGlobalVariableInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedVariableInspection; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; import org.jetbrains.annotations.NotNull; public class GoSuppressionFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/intentions/GoAddFunctionBlockIntentionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/intentions/GoAddFunctionBlockIntentionTest.java similarity index 87% rename from tests/com/goide/intentions/GoAddFunctionBlockIntentionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/intentions/GoAddFunctionBlockIntentionTest.java index aecc93c0a2..b0e0761847 100644 --- a/tests/com/goide/intentions/GoAddFunctionBlockIntentionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/intentions/GoAddFunctionBlockIntentionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.intentions; +package com.notzippy.intellij.go.intellij.intentions; -import com.goide.quickfix.GoQuickFixTestBase; +import com.notzippy.intellij.go.intellij.quickfix.GoQuickFixTestBase; public class GoAddFunctionBlockIntentionTest extends GoQuickFixTestBase { public void testSimple() { diff --git a/tests/com/goide/lexer/GoLexerTest.java b/src/test/java/com/notzippy/intellij/go/intellij/lexer/GoLexerTest.java similarity index 96% rename from tests/com/goide/lexer/GoLexerTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/lexer/GoLexerTest.java index e0d4024ac7..934aca6dab 100644 --- a/tests/com/goide/lexer/GoLexerTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/lexer/GoLexerTest.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.goide.lexer; +package com.notzippy.intellij.go.intellij.lexer; +import com.notzippy.intellij.go.lexer.GoLexer; import com.intellij.lexer.Lexer; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; diff --git a/tests/com/goide/marker/GoRecursiveMethodCallMarkerInfoTest.java b/src/test/java/com/notzippy/intellij/go/intellij/marker/GoRecursiveMethodCallMarkerInfoTest.java similarity index 93% rename from tests/com/goide/marker/GoRecursiveMethodCallMarkerInfoTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/marker/GoRecursiveMethodCallMarkerInfoTest.java index dae5b869b4..999e8a3586 100644 --- a/tests/com/goide/marker/GoRecursiveMethodCallMarkerInfoTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/marker/GoRecursiveMethodCallMarkerInfoTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.marker; +package com.notzippy.intellij.go.intellij.marker; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.codeInsight.daemon.GutterMark; import com.intellij.icons.AllIcons; import com.intellij.openapi.util.text.StringUtil; diff --git a/tests/com/goide/parser/GoParseAndConsumeTest.java b/src/test/java/com/notzippy/intellij/go/intellij/parser/GoParseAndConsumeTest.java similarity index 91% rename from tests/com/goide/parser/GoParseAndConsumeTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/parser/GoParseAndConsumeTest.java index 8fcb773149..20612f9021 100644 --- a/tests/com/goide/parser/GoParseAndConsumeTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/parser/GoParseAndConsumeTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.parser; +package com.notzippy.intellij.go.intellij.parser; -import com.goide.GoParserDefinition; +import com.notzippy.intellij.go.intellij.GoParserDefinition; import com.intellij.util.indexing.IndexingDataKeys; public class GoParseAndConsumeTest extends GoParserTestBase { diff --git a/tests/com/goide/parser/GoParserTest.java b/src/test/java/com/notzippy/intellij/go/intellij/parser/GoParserTest.java similarity index 96% rename from tests/com/goide/parser/GoParserTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/parser/GoParserTest.java index b4eb0362d1..5b6df5108f 100644 --- a/tests/com/goide/parser/GoParserTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/parser/GoParserTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.parser; +package com.notzippy.intellij.go.intellij.parser; -import com.goide.GoParserDefinition; +import com.notzippy.intellij.go.intellij.GoParserDefinition; public class GoParserTest extends GoParserTestBase { public GoParserTest() { diff --git a/tests/com/goide/parser/GoParserTestBase.java b/src/test/java/com/notzippy/intellij/go/intellij/parser/GoParserTestBase.java similarity index 97% rename from tests/com/goide/parser/GoParserTestBase.java rename to src/test/java/com/notzippy/intellij/go/intellij/parser/GoParserTestBase.java index 64bedd34a0..607a862e37 100644 --- a/tests/com/goide/parser/GoParserTestBase.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/parser/GoParserTestBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.parser; +package com.notzippy.intellij.go.intellij.parser; import com.intellij.core.CoreApplicationEnvironment; import com.intellij.lang.LanguageExtensionPoint; diff --git a/tests/com/goide/psi/GoFileTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/GoFileTest.java similarity index 94% rename from tests/com/goide/psi/GoFileTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/GoFileTest.java index 782963fce8..722c9e5d86 100644 --- a/tests/com/goide/psi/GoFileTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/GoFileTest.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.intellij.psi; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoFile; public class GoFileTest extends GoCodeInsightFixtureTestCase { public void testRetrieveBuildFlags() { diff --git a/tests/com/goide/psi/GoImportListTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/GoImportListTest.java similarity index 93% rename from tests/com/goide/psi/GoImportListTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/GoImportListTest.java index bc73192b77..0362a855b7 100644 --- a/tests/com/goide/psi/GoImportListTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/GoImportListTest.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.intellij.psi; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.openapi.command.WriteCommandAction; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/psi/GoReadWriteAccessTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/GoReadWriteAccessTest.java similarity index 95% rename from tests/com/goide/psi/GoReadWriteAccessTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/GoReadWriteAccessTest.java index 5455a6066f..266a29658b 100644 --- a/tests/com/goide/psi/GoReadWriteAccessTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/GoReadWriteAccessTest.java @@ -14,9 +14,12 @@ * limitations under the License. */ -package com.goide.psi; +package com.notzippy.intellij.go.intellij.psi; + +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoFieldName; +import com.notzippy.intellij.go.grammar.psi.GoReferenceExpression; -import com.goide.GoCodeInsightFixtureTestCase; import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; diff --git a/tests/com/goide/psi/impl/GoNamedElementTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/impl/GoNamedElementTest.java similarity index 89% rename from tests/com/goide/psi/impl/GoNamedElementTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/impl/GoNamedElementTest.java index 5fa4664781..ecc8777de9 100644 --- a/tests/com/goide/psi/impl/GoNamedElementTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/impl/GoNamedElementTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.intellij.psi.impl; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.psi.GoVarDefinition; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoVarDefinition; import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.LocalSearchScope; diff --git a/tests/com/goide/psi/impl/GoPsiImplUtilTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/impl/GoPsiImplUtilTest.java similarity index 98% rename from tests/com/goide/psi/impl/GoPsiImplUtilTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/impl/GoPsiImplUtilTest.java index 9d6dd232d3..496f9487f1 100644 --- a/tests/com/goide/psi/impl/GoPsiImplUtilTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/impl/GoPsiImplUtilTest.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package com.goide.psi.impl; +package com.notzippy.intellij.go.intellij.psi.impl; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.psi.*; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.*; +import com.notzippy.intellij.go.grammar.psi.impl.GoPsiImplUtil; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; diff --git a/tests/com/goide/psi/legacy/GoLegacyResolveBuiltinTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveBuiltinTest.java similarity index 92% rename from tests/com/goide/psi/legacy/GoLegacyResolveBuiltinTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveBuiltinTest.java index bb79773bef..599e422a12 100644 --- a/tests/com/goide/psi/legacy/GoLegacyResolveBuiltinTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveBuiltinTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.psi.legacy; +package com.notzippy.intellij.go.intellij.psi.legacy; -import com.goide.SdkAware; +import com.notzippy.intellij.go.SdkAware; import org.jetbrains.annotations.NotNull; @SdkAware diff --git a/tests/com/goide/psi/legacy/GoLegacyResolveCallsTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveCallsTest.java similarity index 95% rename from tests/com/goide/psi/legacy/GoLegacyResolveCallsTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveCallsTest.java index 57d2018f80..39318ae115 100644 --- a/tests/com/goide/psi/legacy/GoLegacyResolveCallsTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveCallsTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.psi.legacy; +package com.notzippy.intellij.go.intellij.psi.legacy; -import com.goide.project.GoBuildTargetSettings; -import com.goide.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.project.GoBuildTargetSettings; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; import org.jetbrains.annotations.NotNull; public class GoLegacyResolveCallsTest extends GoLegacyResolveTestBase { diff --git a/tests/com/goide/psi/legacy/GoLegacyResolveCompositeTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveCompositeTest.java similarity index 97% rename from tests/com/goide/psi/legacy/GoLegacyResolveCompositeTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveCompositeTest.java index d0854cedc1..abbeec9997 100644 --- a/tests/com/goide/psi/legacy/GoLegacyResolveCompositeTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveCompositeTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi.legacy; +package com.notzippy.intellij.go.intellij.psi.legacy; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/psi/legacy/GoLegacyResolvePackageTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolvePackageTest.java similarity index 94% rename from tests/com/goide/psi/legacy/GoLegacyResolvePackageTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolvePackageTest.java index bf9d372e8d..fc4626e559 100644 --- a/tests/com/goide/psi/legacy/GoLegacyResolvePackageTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolvePackageTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi.legacy; +package com.notzippy.intellij.go.intellij.psi.legacy; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/psi/legacy/GoLegacyResolveStructTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveStructTest.java similarity index 96% rename from tests/com/goide/psi/legacy/GoLegacyResolveStructTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveStructTest.java index 53cccf730a..856309267b 100644 --- a/tests/com/goide/psi/legacy/GoLegacyResolveStructTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveStructTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi.legacy; +package com.notzippy.intellij.go.intellij.psi.legacy; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/psi/legacy/GoLegacyResolveTestBase.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveTestBase.java similarity index 95% rename from tests/com/goide/psi/legacy/GoLegacyResolveTestBase.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveTestBase.java index ce0c7be661..f94b155af6 100644 --- a/tests/com/goide/psi/legacy/GoLegacyResolveTestBase.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveTestBase.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.psi.legacy; +package com.notzippy.intellij.go.intellij.psi.legacy; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.project.GoModuleLibrariesService; -import com.goide.psi.GoFile; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.intellij.project.GoModuleLibrariesService; +import com.notzippy.intellij.go.grammar.psi.GoFile; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; diff --git a/tests/com/goide/psi/legacy/GoLegacyResolveTypesTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveTypesTest.java similarity index 97% rename from tests/com/goide/psi/legacy/GoLegacyResolveTypesTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveTypesTest.java index 126206c351..faa0421f26 100644 --- a/tests/com/goide/psi/legacy/GoLegacyResolveTypesTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveTypesTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi.legacy; +package com.notzippy.intellij.go.intellij.psi.legacy; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/psi/legacy/GoLegacyResolveVarsTest.java b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveVarsTest.java similarity index 98% rename from tests/com/goide/psi/legacy/GoLegacyResolveVarsTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveVarsTest.java index 84fa847562..3b85fe261f 100644 --- a/tests/com/goide/psi/legacy/GoLegacyResolveVarsTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/psi/legacy/GoLegacyResolveVarsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.psi.legacy; +package com.notzippy.intellij.go.intellij.psi.legacy; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/quickfix/GoAddMissingReturnQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoAddMissingReturnQuickFixTest.java similarity index 88% rename from tests/com/goide/quickfix/GoAddMissingReturnQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoAddMissingReturnQuickFixTest.java index ecd4d76691..215459d1b3 100644 --- a/tests/com/goide/quickfix/GoAddMissingReturnQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoAddMissingReturnQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoMissingReturnInspection; +import com.notzippy.intellij.go.intellij.inspections.GoMissingReturnInspection; public class GoAddMissingReturnQuickFixTest extends GoQuickFixTestBase { @Override diff --git a/tests/com/goide/quickfix/GoAddTrailingCommaQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoAddTrailingCommaQuickFixTest.java similarity index 88% rename from tests/com/goide/quickfix/GoAddTrailingCommaQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoAddTrailingCommaQuickFixTest.java index b7a7012cbf..26051ab5aa 100644 --- a/tests/com/goide/quickfix/GoAddTrailingCommaQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoAddTrailingCommaQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoAddTrailingCommaInspection; +import com.notzippy.intellij.go.intellij.inspections.GoAddTrailingCommaInspection; import org.jetbrains.annotations.NotNull; public class GoAddTrailingCommaQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoAssignmentToComparisonQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoAssignmentToComparisonQuickFixTest.java similarity index 90% rename from tests/com/goide/quickfix/GoAssignmentToComparisonQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoAssignmentToComparisonQuickFixTest.java index eed22cefc4..9908b55d9e 100644 --- a/tests/com/goide/quickfix/GoAssignmentToComparisonQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoAssignmentToComparisonQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoUsedAsValueInCondition; +import com.notzippy.intellij.go.intellij.inspections.GoUsedAsValueInCondition; import org.jetbrains.annotations.NotNull; public class GoAssignmentToComparisonQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoBoolExpressionsInspectionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoBoolExpressionsInspectionTest.java similarity index 92% rename from tests/com/goide/quickfix/GoBoolExpressionsInspectionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoBoolExpressionsInspectionTest.java index f805ae0e51..90380b7449 100644 --- a/tests/com/goide/quickfix/GoBoolExpressionsInspectionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoBoolExpressionsInspectionTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.GoParametrizedTestBase; -import com.goide.SdkAware; -import com.goide.inspections.GoBoolExpressionsInspection; +import com.notzippy.intellij.go.GoParametrizedTestBase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.inspections.GoBoolExpressionsInspection; import org.junit.Before; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/com/goide/quickfix/GoContinueNotInLoopQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoContinueNotInLoopQuickFixTest.java similarity index 94% rename from tests/com/goide/quickfix/GoContinueNotInLoopQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoContinueNotInLoopQuickFixTest.java index d3e71e5b5d..ba8d7d076a 100644 --- a/tests/com/goide/quickfix/GoContinueNotInLoopQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoContinueNotInLoopQuickFixTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/quickfix/GoConvertStringToByteQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoConvertStringToByteQuickFixTest.java similarity index 92% rename from tests/com/goide/quickfix/GoConvertStringToByteQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoConvertStringToByteQuickFixTest.java index cad0ae1dcf..6e8fcdc414 100644 --- a/tests/com/goide/quickfix/GoConvertStringToByteQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoConvertStringToByteQuickFixTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.SdkAware; -import com.goide.inspections.GoStringAndByteTypeMismatchInspection; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.inspections.GoStringAndByteTypeMismatchInspection; import org.jetbrains.annotations.NotNull; @SdkAware diff --git a/tests/com/goide/quickfix/GoCreateGlobalConstQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateGlobalConstQuickFixTest.java similarity index 89% rename from tests/com/goide/quickfix/GoCreateGlobalConstQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateGlobalConstQuickFixTest.java index 15803ef34d..0b6a0365f4 100644 --- a/tests/com/goide/quickfix/GoCreateGlobalConstQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateGlobalConstQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoUnresolvedReferenceInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection; import org.jetbrains.annotations.NotNull; public class GoCreateGlobalConstQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoCreateGlobalVariableQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateGlobalVariableQuickFixTest.java similarity index 87% rename from tests/com/goide/quickfix/GoCreateGlobalVariableQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateGlobalVariableQuickFixTest.java index e460bb2e57..0f73121df0 100644 --- a/tests/com/goide/quickfix/GoCreateGlobalVariableQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateGlobalVariableQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoUnresolvedReferenceInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection; import org.jetbrains.annotations.NotNull; public class GoCreateGlobalVariableQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoCreateLocalConstantQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateLocalConstantQuickFixTest.java similarity index 91% rename from tests/com/goide/quickfix/GoCreateLocalConstantQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateLocalConstantQuickFixTest.java index 0310a5756e..feef10f893 100644 --- a/tests/com/goide/quickfix/GoCreateLocalConstantQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateLocalConstantQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoUnresolvedReferenceInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection; import org.jetbrains.annotations.NotNull; public class GoCreateLocalConstantQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoCreateLocalVariableQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateLocalVariableQuickFixTest.java similarity index 90% rename from tests/com/goide/quickfix/GoCreateLocalVariableQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateLocalVariableQuickFixTest.java index 6917bd62af..9c5ab68054 100644 --- a/tests/com/goide/quickfix/GoCreateLocalVariableQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateLocalVariableQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoUnresolvedReferenceInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection; import org.jetbrains.annotations.NotNull; public class GoCreateLocalVariableQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoCreateWrapperTypeQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateWrapperTypeQuickFixTest.java similarity index 89% rename from tests/com/goide/quickfix/GoCreateWrapperTypeQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateWrapperTypeQuickFixTest.java index a4ca3e363a..22cc10799e 100644 --- a/tests/com/goide/quickfix/GoCreateWrapperTypeQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoCreateWrapperTypeQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoUnresolvedReferenceInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection; import org.jetbrains.annotations.NotNull; public class GoCreateWrapperTypeQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoDeleteConstDefinitionQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteConstDefinitionQuickFixTest.java similarity index 90% rename from tests/com/goide/quickfix/GoDeleteConstDefinitionQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteConstDefinitionQuickFixTest.java index 105fb56656..99617960d6 100644 --- a/tests/com/goide/quickfix/GoDeleteConstDefinitionQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteConstDefinitionQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoUnusedConstInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedConstInspection; public class GoDeleteConstDefinitionQuickFixTest extends GoQuickFixTestBase { @Override diff --git a/tests/com/goide/quickfix/GoDeleteVarDefinitionQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteVarDefinitionQuickFixTest.java similarity index 91% rename from tests/com/goide/quickfix/GoDeleteVarDefinitionQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteVarDefinitionQuickFixTest.java index 4d9671d8a0..13ff9cba54 100644 --- a/tests/com/goide/quickfix/GoDeleteVarDefinitionQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoDeleteVarDefinitionQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoUnusedVariableInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedVariableInspection; public class GoDeleteVarDefinitionQuickFixTest extends GoQuickFixTestBase { @Override diff --git a/tests/com/goide/quickfix/GoEmptySignatureQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoEmptySignatureQuickFixTest.java similarity index 94% rename from tests/com/goide/quickfix/GoEmptySignatureQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoEmptySignatureQuickFixTest.java index b1629b4729..dd9186f97d 100644 --- a/tests/com/goide/quickfix/GoEmptySignatureQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoEmptySignatureQuickFixTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; public class GoEmptySignatureQuickFixTest extends GoQuickFixTestBase { public void testSimple() { diff --git a/tests/com/goide/quickfix/GoExportedOwnDeclarationQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoExportedOwnDeclarationQuickFixTest.java similarity index 93% rename from tests/com/goide/quickfix/GoExportedOwnDeclarationQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoExportedOwnDeclarationQuickFixTest.java index 563d47599d..ae19509a32 100644 --- a/tests/com/goide/quickfix/GoExportedOwnDeclarationQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoExportedOwnDeclarationQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoExportedOwnDeclarationInspection; +import com.notzippy.intellij.go.intellij.inspections.GoExportedOwnDeclarationInspection; import org.jetbrains.annotations.NotNull; public class GoExportedOwnDeclarationQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoIntroduceFunctionFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoIntroduceFunctionFixTest.java similarity index 97% rename from tests/com/goide/quickfix/GoIntroduceFunctionFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoIntroduceFunctionFixTest.java index 70e86af73b..6b72f8acf4 100644 --- a/tests/com/goide/quickfix/GoIntroduceFunctionFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoIntroduceFunctionFixTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.SdkAware; -import com.goide.inspections.unresolved.GoUnresolvedReferenceInspection; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/quickfix/GoMoveToStructInitializationIntentionTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoMoveToStructInitializationIntentionTest.java similarity index 96% rename from tests/com/goide/quickfix/GoMoveToStructInitializationIntentionTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoMoveToStructInitializationIntentionTest.java index 84fe19eda1..e4f2081512 100644 --- a/tests/com/goide/quickfix/GoMoveToStructInitializationIntentionTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoMoveToStructInitializationIntentionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.intentions.GoMoveToStructInitializationIntention; +import com.notzippy.intellij.go.intellij.intentions.GoMoveToStructInitializationIntention; import org.jetbrains.annotations.NotNull; public class GoMoveToStructInitializationIntentionTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoMultiplePackagesQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoMultiplePackagesQuickFixTest.java similarity index 92% rename from tests/com/goide/quickfix/GoMultiplePackagesQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoMultiplePackagesQuickFixTest.java index e9f34437f6..0c205d9193 100644 --- a/tests/com/goide/quickfix/GoMultiplePackagesQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoMultiplePackagesQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoMultiplePackagesInspection; +import com.notzippy.intellij.go.intellij.inspections.GoMultiplePackagesInspection; import org.jetbrains.annotations.NotNull; public class GoMultiplePackagesQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoQuickFixTestBase.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoQuickFixTestBase.java similarity index 94% rename from tests/com/goide/quickfix/GoQuickFixTestBase.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoQuickFixTestBase.java index 7af0873b79..b937aeed84 100644 --- a/tests/com/goide/quickfix/GoQuickFixTestBase.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoQuickFixTestBase.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.codeInsight.intention.IntentionAction; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/quickfix/GoRenameFunctionQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameFunctionQuickFixTest.java similarity index 88% rename from tests/com/goide/quickfix/GoRenameFunctionQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameFunctionQuickFixTest.java index 153eb06c62..1814fd6392 100644 --- a/tests/com/goide/quickfix/GoRenameFunctionQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameFunctionQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoUnusedFunctionInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedFunctionInspection; import org.jetbrains.annotations.NotNull; public class GoRenameFunctionQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoRenameVarQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameVarQuickFixTest.java similarity index 91% rename from tests/com/goide/quickfix/GoRenameVarQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameVarQuickFixTest.java index 212952e721..d34201d601 100644 --- a/tests/com/goide/quickfix/GoRenameVarQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoRenameVarQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoUnusedVariableInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnusedVariableInspection; import org.jetbrains.annotations.NotNull; public class GoRenameVarQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoReplaceWithAssignmentStatementQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithAssignmentStatementQuickFixTest.java similarity index 91% rename from tests/com/goide/quickfix/GoReplaceWithAssignmentStatementQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithAssignmentStatementQuickFixTest.java index 48fd5e0480..65255022ac 100644 --- a/tests/com/goide/quickfix/GoReplaceWithAssignmentStatementQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithAssignmentStatementQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoNoNewVariablesInspection; +import com.notzippy.intellij.go.intellij.inspections.GoNoNewVariablesInspection; import org.jetbrains.annotations.NotNull; public class GoReplaceWithAssignmentStatementQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoReplaceWithDeclarationQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithDeclarationQuickFixTest.java similarity index 85% rename from tests/com/goide/quickfix/GoReplaceWithDeclarationQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithDeclarationQuickFixTest.java index 5759baf424..e5021132bf 100644 --- a/tests/com/goide/quickfix/GoReplaceWithDeclarationQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithDeclarationQuickFixTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.unresolved.GoReplaceAssignmentWithDeclarationQuickFix; -import com.goide.inspections.unresolved.GoUnresolvedReferenceInspection; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoReplaceAssignmentWithDeclarationQuickFix; +import com.notzippy.intellij.go.intellij.inspections.unresolved.GoUnresolvedReferenceInspection; import org.jetbrains.annotations.NotNull; public class GoReplaceWithDeclarationQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoReplaceWithImportForSideEffectsQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithImportForSideEffectsQuickFixTest.java similarity index 86% rename from tests/com/goide/quickfix/GoReplaceWithImportForSideEffectsQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithImportForSideEffectsQuickFixTest.java index 56f2510568..6d8e86c7e5 100644 --- a/tests/com/goide/quickfix/GoReplaceWithImportForSideEffectsQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithImportForSideEffectsQuickFixTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.SdkAware; -import com.goide.inspections.GoUnusedImportInspection; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.intellij.inspections.GoUnusedImportInspection; @SdkAware public class GoReplaceWithImportForSideEffectsQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/quickfix/GoReplaceWithSelectStatementQuickFixTest.java b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithSelectStatementQuickFixTest.java similarity index 89% rename from tests/com/goide/quickfix/GoReplaceWithSelectStatementQuickFixTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithSelectStatementQuickFixTest.java index a16205217c..ff3cb80725 100644 --- a/tests/com/goide/quickfix/GoReplaceWithSelectStatementQuickFixTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/quickfix/GoReplaceWithSelectStatementQuickFixTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.quickfix; +package com.notzippy.intellij.go.intellij.quickfix; -import com.goide.inspections.GoInfiniteForInspection; +import com.notzippy.intellij.go.intellij.inspections.GoInfiniteForInspection; import org.jetbrains.annotations.NotNull; public class GoReplaceWithSelectStatementQuickFixTest extends GoQuickFixTestBase { diff --git a/tests/com/goide/refactor/GoIntroduceVariableTest.java b/src/test/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableTest.java similarity index 97% rename from tests/com/goide/refactor/GoIntroduceVariableTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableTest.java index 944a2e6ab7..9dc54851ee 100644 --- a/tests/com/goide/refactor/GoIntroduceVariableTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/refactor/GoIntroduceVariableTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.refactor; +package com.notzippy.intellij.go.intellij.refactor; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.util.CommonRefactoringUtil; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/regexp/GoRegExpLanguageTest.java b/src/test/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpLanguageTest.java similarity index 85% rename from tests/com/goide/regexp/GoRegExpLanguageTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpLanguageTest.java index 7fe821fb91..53a4eb065a 100644 --- a/tests/com/goide/regexp/GoRegExpLanguageTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/regexp/GoRegExpLanguageTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.regexp; +package com.notzippy.intellij.go.intellij.regexp; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.SdkAware; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.SdkAware; @SdkAware public class GoRegExpLanguageTest extends GoCodeInsightFixtureTestCase { diff --git a/tests/com/goide/rename/GoRenameTest.java b/src/test/java/com/notzippy/intellij/go/intellij/rename/GoRenameTest.java similarity index 96% rename from tests/com/goide/rename/GoRenameTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/rename/GoRenameTest.java index e3cda8c567..523be6f532 100644 --- a/tests/com/goide/rename/GoRenameTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/rename/GoRenameTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.rename; +package com.notzippy.intellij.go.intellij.rename; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.refactoring.util.CommonRefactoringUtil; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/runconfig/GoConsoleFilterTest.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/GoConsoleFilterTest.java similarity index 96% rename from tests/com/goide/runconfig/GoConsoleFilterTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/GoConsoleFilterTest.java index 141d054d95..13d271ec59 100644 --- a/tests/com/goide/runconfig/GoConsoleFilterTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/GoConsoleFilterTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.project.GoApplicationLibrariesService; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.intellij.project.GoApplicationLibrariesService; import com.intellij.execution.filters.Filter; import com.intellij.execution.filters.HyperlinkInfo; import com.intellij.execution.filters.OpenFileHyperlinkInfo; diff --git a/tests/com/goide/runconfig/GoRunConfigurationProducerTest.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationProducerTest.java similarity index 89% rename from tests/com/goide/runconfig/GoRunConfigurationProducerTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationProducerTest.java index a763c91eed..b13ea1276c 100644 --- a/tests/com/goide/runconfig/GoRunConfigurationProducerTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationProducerTest.java @@ -1,11 +1,11 @@ -package com.goide.runconfig; - -import com.goide.runconfig.application.GoApplicationConfiguration; -import com.goide.runconfig.application.GoApplicationRunConfigurationProducer; -import com.goide.runconfig.application.GoApplicationRunConfigurationType; -import com.goide.runconfig.file.GoRunFileConfiguration; -import com.goide.runconfig.file.GoRunFileConfigurationProducer; -import com.goide.runconfig.file.GoRunFileConfigurationType; +package com.notzippy.intellij.go.intellij.runconfig; + +import com.notzippy.intellij.go.intellij.runconfig.application.GoApplicationConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.application.GoApplicationRunConfigurationProducer; +import com.notzippy.intellij.go.intellij.runconfig.application.GoApplicationRunConfigurationType; +import com.notzippy.intellij.go.intellij.runconfig.file.GoRunFileConfiguration; +import com.notzippy.intellij.go.intellij.runconfig.file.GoRunFileConfigurationProducer; +import com.notzippy.intellij.go.intellij.runconfig.file.GoRunFileConfigurationType; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; diff --git a/tests/com/goide/runconfig/GoRunConfigurationTestCase.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationTestCase.java similarity index 94% rename from tests/com/goide/runconfig/GoRunConfigurationTestCase.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationTestCase.java index 5b3023305e..00f740af6e 100644 --- a/tests/com/goide/runconfig/GoRunConfigurationTestCase.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/GoRunConfigurationTestCase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.runconfig; +package com.notzippy.intellij.go.intellij.runconfig; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.SdkAware; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.SdkAware; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.actions.ConfigurationFromContext; import com.intellij.execution.configurations.RunConfiguration; diff --git a/tests/com/goide/runconfig/testing/GoEventsConverterTestCase.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoEventsConverterTestCase.java similarity index 95% rename from tests/com/goide/runconfig/testing/GoEventsConverterTestCase.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoEventsConverterTestCase.java index 85070ab20b..f10991c0e1 100644 --- a/tests/com/goide/runconfig/testing/GoEventsConverterTestCase.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoEventsConverterTestCase.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.execution.Executor; import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.process.ProcessOutputTypes; diff --git a/tests/com/goide/runconfig/testing/GoRunLineMarkerTest.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoRunLineMarkerTest.java similarity index 93% rename from tests/com/goide/runconfig/testing/GoRunLineMarkerTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoRunLineMarkerTest.java index 4c6e6349f9..c8d64cabd5 100644 --- a/tests/com/goide/runconfig/testing/GoRunLineMarkerTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoRunLineMarkerTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.runconfig.GoRunConfigurationTestCase; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationTestCase; public class GoRunLineMarkerTest extends GoRunConfigurationTestCase { public void testRunTestLineMarker() { diff --git a/tests/com/goide/runconfig/testing/GoTestRunConfigurationProducerTest.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationProducerTest.java similarity index 95% rename from tests/com/goide/runconfig/testing/GoTestRunConfigurationProducerTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationProducerTest.java index 8d5c650f03..53a7a0ec2f 100644 --- a/tests/com/goide/runconfig/testing/GoTestRunConfigurationProducerTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GoTestRunConfigurationProducerTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.runconfig.GoRunConfigurationTestCase; -import com.goide.runconfig.testing.frameworks.gobench.GobenchFramework; -import com.goide.runconfig.testing.frameworks.gobench.GobenchRunConfigurationProducer; -import com.goide.runconfig.testing.frameworks.gotest.GotestFramework; -import com.goide.runconfig.testing.frameworks.gotest.GotestRunConfigurationProducer; +import com.notzippy.intellij.go.intellij.runconfig.GoRunConfigurationTestCase; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gobench.GobenchFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gobench.GobenchRunConfigurationProducer; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GotestFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GotestRunConfigurationProducer; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.actions.RunConfigurationProducer; import com.intellij.psi.PsiDirectory; diff --git a/tests/com/goide/runconfig/testing/GobenchEventsConverterTest.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GobenchEventsConverterTest.java similarity index 88% rename from tests/com/goide/runconfig/testing/GobenchEventsConverterTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GobenchEventsConverterTest.java index 8bdf8c4af2..b93ccedcd7 100644 --- a/tests/com/goide/runconfig/testing/GobenchEventsConverterTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GobenchEventsConverterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.runconfig.testing.frameworks.gobench.GobenchFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gobench.GobenchFramework; import org.jetbrains.annotations.NotNull; public class GobenchEventsConverterTest extends GoEventsConverterTestCase { diff --git a/tests/com/goide/runconfig/testing/GocheckEventsConverterTest.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GocheckEventsConverterTest.java similarity index 91% rename from tests/com/goide/runconfig/testing/GocheckEventsConverterTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GocheckEventsConverterTest.java index bb03c64403..c845071f8e 100644 --- a/tests/com/goide/runconfig/testing/GocheckEventsConverterTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GocheckEventsConverterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.runconfig.testing.frameworks.gocheck.GocheckFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gocheck.GocheckFramework; import org.jetbrains.annotations.NotNull; public class GocheckEventsConverterTest extends GoEventsConverterTestCase { diff --git a/tests/com/goide/runconfig/testing/GotestEventsConverterTest.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GotestEventsConverterTest.java similarity index 90% rename from tests/com/goide/runconfig/testing/GotestEventsConverterTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GotestEventsConverterTest.java index 96e746fae6..39495944c5 100644 --- a/tests/com/goide/runconfig/testing/GotestEventsConverterTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/GotestEventsConverterTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; -import com.goide.runconfig.testing.frameworks.gotest.GotestFramework; +import com.notzippy.intellij.go.intellij.runconfig.testing.frameworks.gotest.GotestFramework; import org.jetbrains.annotations.NotNull; public class GotestEventsConverterTest extends GoEventsConverterTestCase { diff --git a/tests/com/goide/runconfig/testing/LoggingServiceMessageVisitor.java b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/LoggingServiceMessageVisitor.java similarity index 98% rename from tests/com/goide/runconfig/testing/LoggingServiceMessageVisitor.java rename to src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/LoggingServiceMessageVisitor.java index e9a6079692..125ad89155 100644 --- a/tests/com/goide/runconfig/testing/LoggingServiceMessageVisitor.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/runconfig/testing/LoggingServiceMessageVisitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.runconfig.testing; +package com.notzippy.intellij.go.intellij.runconfig.testing; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; diff --git a/tests/com/goide/sdk/GoPathLibraryTest.java b/src/test/java/com/notzippy/intellij/go/intellij/sdk/GoPathLibraryTest.java similarity index 95% rename from tests/com/goide/sdk/GoPathLibraryTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/sdk/GoPathLibraryTest.java index 9bdbe9f408..3d29fd3875 100644 --- a/tests/com/goide/sdk/GoPathLibraryTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/sdk/GoPathLibraryTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.sdk; +package com.notzippy.intellij.go.intellij.sdk; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.GoModuleType; -import com.goide.project.GoApplicationLibrariesService; -import com.goide.project.GoModuleLibrariesInitializer; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.intellij.GoModuleType; +import com.notzippy.intellij.go.intellij.project.GoApplicationLibrariesService; +import com.notzippy.intellij.go.intellij.project.GoModuleLibrariesInitializer; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.roots.*; diff --git a/tests/com/goide/sdk/GoSdkUtilTest.java b/src/test/java/com/notzippy/intellij/go/intellij/sdk/GoSdkUtilTest.java similarity index 98% rename from tests/com/goide/sdk/GoSdkUtilTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/sdk/GoSdkUtilTest.java index 408967f45f..3b0566325f 100644 --- a/tests/com/goide/sdk/GoSdkUtilTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/sdk/GoSdkUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.goide.sdk; +package com.notzippy.intellij.go.intellij.sdk; import org.junit.Test; diff --git a/tests/com/goide/stubs/GoPackageClauseStubTest.java b/src/test/java/com/notzippy/intellij/go/intellij/stubs/GoPackageClauseStubTest.java similarity index 89% rename from tests/com/goide/stubs/GoPackageClauseStubTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/stubs/GoPackageClauseStubTest.java index af5c6ebb38..166543be1b 100644 --- a/tests/com/goide/stubs/GoPackageClauseStubTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/stubs/GoPackageClauseStubTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.intellij.stubs; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.psi.GoFile; -import com.goide.psi.GoPackageClause; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoFile; +import com.notzippy.intellij.go.grammar.psi.GoPackageClause; import com.intellij.openapi.vfs.VirtualFileFilter; import com.intellij.psi.impl.PsiManagerImpl; import com.intellij.testFramework.exceptionCases.AssertionErrorCase; diff --git a/tests/com/goide/stubs/GoStubTest.java b/src/test/java/com/notzippy/intellij/go/intellij/stubs/GoStubTest.java similarity index 93% rename from tests/com/goide/stubs/GoStubTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/stubs/GoStubTest.java index 70ecdbcd0f..16e30b6691 100644 --- a/tests/com/goide/stubs/GoStubTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/stubs/GoStubTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.stubs; +package com.notzippy.intellij.go.intellij.stubs; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiFile; import com.intellij.testFramework.ParsingTestCase; diff --git a/tests/com/goide/type/GoExpectedTypesTest.java b/src/test/java/com/notzippy/intellij/go/intellij/type/GoExpectedTypesTest.java similarity index 95% rename from tests/com/goide/type/GoExpectedTypesTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/type/GoExpectedTypesTest.java index ac303d7b54..1f382a83ba 100644 --- a/tests/com/goide/type/GoExpectedTypesTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/type/GoExpectedTypesTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.type; +package com.notzippy.intellij.go.intellij.type; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.SdkAware; -import com.goide.psi.GoExpression; -import com.goide.psi.impl.GoTypeUtil; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.impl.GoTypeUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; diff --git a/tests/com/goide/type/GoTypeResolveTest.java b/src/test/java/com/notzippy/intellij/go/intellij/type/GoTypeResolveTest.java similarity index 94% rename from tests/com/goide/type/GoTypeResolveTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/type/GoTypeResolveTest.java index 1a31f3ad48..91f9ea5488 100644 --- a/tests/com/goide/type/GoTypeResolveTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/type/GoTypeResolveTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.type; +package com.notzippy.intellij.go.intellij.type; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.SdkAware; -import com.goide.psi.GoType; -import com.goide.psi.GoTypeOwner; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.grammar.psi.GoType; +import com.notzippy.intellij.go.grammar.psi.GoTypeOwner; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/type/GoUnderlyingTypeTest.java b/src/test/java/com/notzippy/intellij/go/intellij/type/GoUnderlyingTypeTest.java similarity index 92% rename from tests/com/goide/type/GoUnderlyingTypeTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/type/GoUnderlyingTypeTest.java index 1565610ca2..59b4b61e95 100644 --- a/tests/com/goide/type/GoUnderlyingTypeTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/type/GoUnderlyingTypeTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.goide.type; +package com.notzippy.intellij.go.intellij.type; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.psi.GoType; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoType; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/usages/GoFileStructureGroupRuleTest.java b/src/test/java/com/notzippy/intellij/go/intellij/usages/GoFileStructureGroupRuleTest.java similarity index 89% rename from tests/com/goide/usages/GoFileStructureGroupRuleTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/usages/GoFileStructureGroupRuleTest.java index 9badc61bd0..8179682559 100644 --- a/tests/com/goide/usages/GoFileStructureGroupRuleTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/usages/GoFileStructureGroupRuleTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.usages; +package com.notzippy.intellij.go.intellij.usages; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.psi.GoFunctionDeclaration; -import com.goide.psi.GoTypeSpec; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoFunctionDeclaration; +import com.notzippy.intellij.go.grammar.psi.GoTypeSpec; import com.intellij.psi.PsiElement; import com.intellij.usageView.UsageInfo; import com.intellij.usages.PsiElementUsageGroupBase; diff --git a/tests/com/goide/util/GoBuildMatcherTest.java b/src/test/java/com/notzippy/intellij/go/intellij/util/GoBuildMatcherTest.java similarity index 98% rename from tests/com/goide/util/GoBuildMatcherTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/util/GoBuildMatcherTest.java index ea3514daea..31fbb41841 100644 --- a/tests/com/goide/util/GoBuildMatcherTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/util/GoBuildMatcherTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; -import com.goide.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; import com.intellij.psi.PsiFile; import com.intellij.util.ThreeState; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/util/GoExpressionUtilTest.java b/src/test/java/com/notzippy/intellij/go/intellij/util/GoExpressionUtilTest.java similarity index 91% rename from tests/com/goide/util/GoExpressionUtilTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/util/GoExpressionUtilTest.java index aa8e40c14b..ed840e2398 100644 --- a/tests/com/goide/util/GoExpressionUtilTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/util/GoExpressionUtilTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; -import com.goide.GoParametrizedTestBase; -import com.goide.SdkAware; -import com.goide.psi.GoCallExpr; -import com.goide.psi.GoExpression; -import com.goide.psi.impl.GoExpressionUtil; +import com.notzippy.intellij.go.GoParametrizedTestBase; +import com.notzippy.intellij.go.SdkAware; +import com.notzippy.intellij.go.grammar.psi.GoCallExpr; +import com.notzippy.intellij.go.grammar.psi.GoExpression; +import com.notzippy.intellij.go.grammar.psi.impl.GoExpressionUtil; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; diff --git a/tests/com/goide/util/GoPackageUtilTest.java b/src/test/java/com/notzippy/intellij/go/intellij/util/GoPackageUtilTest.java similarity index 88% rename from tests/com/goide/util/GoPackageUtilTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/util/GoPackageUtilTest.java index 3beb73d2a3..dbaf6d4e3e 100644 --- a/tests/com/goide/util/GoPackageUtilTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/util/GoPackageUtilTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.project.GoBuildTargetSettings; -import com.goide.project.GoModuleSettings; -import com.goide.sdk.GoPackageUtil; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.intellij.project.GoBuildTargetSettings; +import com.notzippy.intellij.go.intellij.project.GoModuleSettings; +import com.notzippy.intellij.go.intellij.sdk.GoPackageUtil; public class GoPackageUtilTest extends GoCodeInsightFixtureTestCase { public void testPackageNameOfTestPackageInNonTestFile() { diff --git a/tests/com/goide/util/GoStringLiteralEscaperEscapeStringTest.java b/src/test/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaperEscapeStringTest.java similarity index 94% rename from tests/com/goide/util/GoStringLiteralEscaperEscapeStringTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaperEscapeStringTest.java index cbd724fbde..7b991c8312 100644 --- a/tests/com/goide/util/GoStringLiteralEscaperEscapeStringTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaperEscapeStringTest.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; +import com.notzippy.intellij.go.parser.GoStringLiteralEscaper; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/tests/com/goide/util/GoStringLiteralEscaperTest.java b/src/test/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaperTest.java similarity index 97% rename from tests/com/goide/util/GoStringLiteralEscaperTest.java rename to src/test/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaperTest.java index 539a299762..bf22768c38 100644 --- a/tests/com/goide/util/GoStringLiteralEscaperTest.java +++ b/src/test/java/com/notzippy/intellij/go/intellij/util/GoStringLiteralEscaperTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.goide.util; +package com.notzippy.intellij.go.intellij.util; -import com.goide.GoCodeInsightFixtureTestCase; -import com.goide.psi.GoStringLiteral; -import com.goide.psi.impl.GoElementFactory; +import com.notzippy.intellij.go.GoCodeInsightFixtureTestCase; +import com.notzippy.intellij.go.grammar.psi.GoStringLiteral; +import com.notzippy.intellij.go.grammar.psi.impl.GoElementFactory; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.psi.LiteralTextEscaper; diff --git a/tests/com/goide/categories/Performance.java b/tests/com/goide/categories/Performance.java deleted file mode 100644 index fe1f169212..0000000000 --- a/tests/com/goide/categories/Performance.java +++ /dev/null @@ -1,3 +0,0 @@ -package com.goide.categories; - -public interface Performance {}