Skip to content

Commit e6b919a

Browse files
Merge pull request #90 from brendandouglas/master
Import of bazel plugin using copybara
2 parents a639736 + 8559ad4 commit e6b919a

File tree

630 files changed

+20905
-5232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

630 files changed

+20905
-5232
lines changed

BUILD

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44

55
licenses(["notice"]) # Apache 2.0
66

7+
# Changelog file
8+
filegroup(
9+
name = "changelog",
10+
srcs = ["CHANGELOG"],
11+
visibility = ["//:__subpackages__"],
12+
)
13+
714
# IJwB tests, run with an IntelliJ plugin SDK
815
test_suite(
916
name = "ijwb_tests",
@@ -16,6 +23,10 @@ test_suite(
1623
"//java:integration_tests",
1724
"//java:unit_tests",
1825
"//plugin_dev:integration_tests",
26+
"//python:integration_tests",
27+
"//python:unit_tests",
28+
"//scala:integration_tests",
29+
"//scala:unit_tests",
1930
],
2031
)
2132

@@ -38,5 +49,6 @@ test_suite(
3849
tests = [
3950
"//base:unit_tests",
4051
"//cpp:unit_tests",
52+
"//python:unit_tests",
4153
],
4254
)

CHANGELOG

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
v2017.05.08
2+
===========
3+
* Add Python support to CLion
4+
* Fix some bazel targets not being linkified in the run configuration console
5+
output
6+
* Add an action to open a workspace file outside your project (File > Open
7+
Workspace File...)
8+
* Add an action to add a source directory to your bazel project (Bazel >
9+
Project > Add Directory To Project...)
10+
* CLion: fix project directories being cleared when reopening a project
11+
12+
v2017.04.17
13+
===========
14+
* Add support for IntelliJ 2017.1
15+
* Support bazel build sharding for large projects
16+
* Detect out-of-memory errors during sync, and suggest enabling sharding
17+
* Add documentation links for .bazelproject items
18+
19+
v2017.04.03
20+
===========
21+
* Add python support for IntelliJ
22+
* Prefetch project files on project open, prior to initial indexing
23+
* Handle nested junit test classes
24+
25+
v2017.03.15
26+
===========
27+
* Bazel: WORKSPACE file language integration (syntax highlighting, navigation,
28+
etc.)
29+
* Bazel: Find usages, navigation support for external workspace labels
30+
* Expand macros in run configuration build flags
31+
32+
v2017.02.27
33+
===========
34+
* Add CLion support
35+
* Run configuration support for abstract test classes/methods
36+
* Support running all test classes in a directory
37+
* BUILD support: don't suggest private symbols in 'load' statement autocomplete
38+
39+
v2017.02.13
40+
===========
41+
* Test UI support for parameterized tests
42+
* Test UI support for sharded tests, run locally
43+
* BUILD: Fix navigation for overridden built-in symbols
44+
* BUILD: Add auto-complete for fully-qualified class names
45+
46+
v2017.01.30
47+
============
48+
* Integrate bazel test results with the IDE's test runner UI.
49+
* Add support for sharing run configurations
50+
* Restructure Bazel menu items
51+
52+
v2017.01.09
53+
===========
54+
* Create source roots for all directories matching 'test_sources'.
55+
* When viewing source files for supported but inactive languages, suggest
56+
enabling support for that language.
57+
* BUILD: Add syntax highlight/autocomplete support for more built-in functions.
58+
* Fix java debugger connection timeout
59+
* Basic support for Go-lang projects
60+
61+
v2016.12.5
62+
==========
63+
* BUILD files: add syntax hightlighting for built-in names
64+
* BUILD files: support aliased load statements
65+
* ASwB: enable NDK support
66+
67+
v1.12
68+
=====
69+
* Add autocomplete in run configuration target editor.
70+
* Fix debugging of java_binary targets with args
71+
72+
v1.11
73+
=====
74+
* Completely suppress JUnit for Bazel projects, removing a common source of
75+
confusion.
76+
* Improve sync working set / partial sync to include more targets that
77+
users might expect should be included.
78+
* Add more history to import wizard.
79+
80+
v1.10
81+
=====
82+
* Compatibility with 2016.2.4
83+
* Improve create run configuration from scratch experience
84+
85+
v1.9
86+
==========
87+
* Better tolerance of broken BUILD files during sync
88+
* Sync working set action -- sync only the files you're
89+
working on.
90+
* BUILD file support: performance improvements.
91+
* Unified run configurations -- there is only one type,
92+
the Bazel Command Run Configuration.
93+
* Add test rule chooser heuristics, to support some common
94+
test genrules.
95+
96+
v1.8
97+
==========
98+
* Add local jar cache to improve performance and robustness.
99+
* Support filtered gen jars to allow mixed generated/non-
100+
generated rules (requires bazel release to activate).
101+
* Abbreviate generated run configuration names.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ with live, working code and we will start accepting contributions.
1313
## Installation
1414

1515
You can find our plugin in the Jetbrains plugin repository by going to
16-
`Settings -> Browse Repositories`, and searching for `IntelliJ with Bazel`
17-
or `Android Studio with Bazel`.
16+
`Settings -> Browse Repositories`, and searching for `IntelliJ with Bazel`,
17+
`Android Studio with Bazel`, or `CLion with Bazel`.
1818

1919
## Usage
2020

@@ -25,6 +25,6 @@ Detailed docs are available [here](http://ij.bazel.build).
2525

2626
## Building the plugin
2727

28-
Install Bazel, then run 'bazel build //ijwb:ijwb_bazel --define=ij_product=intellij-latest'
28+
Install Bazel, then run `bazel build //ijwb:ijwb_bazel --define=ij_product=intellij-latest`
2929
from the project root. This will create a plugin jar in
30-
'bazel-genfiles/ijwb/ijwb_bazel.jar'.
30+
`bazel-genfiles/ijwb/ijwb_bazel.jar`.

WORKSPACE

Lines changed: 54 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ workspace(name = "intellij_with_bazel")
22

33
# Long-lived download links available at: https://www.jetbrains.com/intellij-repository/releases
44

5+
# The plugin api for IntelliJ 2017.1.1. This is required to build IJwB,
6+
# and run integration tests.
7+
new_http_archive(
8+
name = "intellij_ce_2017_1_1",
9+
build_file = "intellij_platform_sdk/BUILD.idea",
10+
url = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIC/2017.1.1/ideaIC-2017.1.1.zip",
11+
)
12+
513
# The plugin api for IntelliJ 2016.3.1. This is required to build IJwB,
614
# and run integration tests.
715
new_http_archive(
@@ -34,28 +42,62 @@ new_http_archive(
3442
url = "https://download.jetbrains.com/cpp/CLion-2016.3.2.tar.gz",
3543
)
3644

37-
# The plugin api for Android Studio 2.3 Beta 1. This is required to build ASwB,
45+
# The plugin api for CLion 2017.1.1. This is required to build CLwB,
3846
# and run integration tests.
3947
new_http_archive(
40-
name = "android_studio_2_3_0_3",
41-
build_file = "intellij_platform_sdk/BUILD.android_studio",
42-
url = "https://dl.google.com/dl/android/studio/ide-zips/2.3.0.3/android-studio-ide-162.3573574-linux.zip",
48+
name = "clion_2017_1_1",
49+
build_file = "intellij_platform_sdk/BUILD.clion",
50+
url = "https://download.jetbrains.com/cpp/CLion-2017.1.1.tar.gz",
4351
)
4452

45-
# The plugin api for Android Studio 2.3 Beta 2. This is required to build ASwB,
53+
# The plugin api for Android Studio 2.3.1. This is required to build ASwB,
4654
# and run integration tests.
4755
new_http_archive(
48-
name = "android_studio_2_3_0_4",
56+
name = "android_studio_2_3_1_0",
4957
build_file = "intellij_platform_sdk/BUILD.android_studio",
50-
url = "https://dl.google.com/dl/android/studio/ide-zips/2.3.0.4/android-studio-ide-162.3616766-linux.zip",
58+
url = "https://dl.google.com/dl/android/studio/ide-zips/2.3.1.0/android-studio-ide-162.3871768-linux.zip",
5159
)
5260

53-
# The plugin api for Android Studio 2.2 stable. This is required to build ASwB,
54-
# and run integration tests.
61+
# Python plugin for IntelliJ CE 2016.3. Required at compile-time for python-specific features.
5562
new_http_archive(
56-
name = "AI_145_1617_8",
57-
build_file = "intellij_platform_sdk/BUILD.android_studio",
58-
url = "https://dl.google.com/dl/android/studio/ide-zips/2.2.0.12/android-studio-ide-145.3276617-linux.zip",
63+
name = "python_2016_3",
64+
build_file_content = "\n".join([
65+
"java_import(",
66+
" name = 'python',",
67+
" jars = ['python/lib/python.jar'],",
68+
" visibility = ['//visibility:public'],",
69+
")"]),
70+
url = "https://plugins.jetbrains.com/files/7322/32326/python-community-163.298.zip",
71+
)
72+
73+
# Python plugin for IntelliJ CE 2017.1. Required at compile-time for python-specific features.
74+
new_http_archive(
75+
name = "python_2017_1",
76+
build_file_content = "\n".join([
77+
"java_import(",
78+
" name = 'python',",
79+
" jars = ['python-ce/lib/python-ce.jar'],",
80+
" visibility = ['//visibility:public'],",
81+
")"]),
82+
url = "https://plugins.jetbrains.com/files/7322/33704/python-ce-2017.1.171.3780.116.zip",
83+
)
84+
85+
# Scala plugin for IntelliJ CE 2017.1. Required at compile-time for scala-specific features.
86+
new_http_archive(
87+
name = "scala_2017_1",
88+
build_file_content = "\n".join([
89+
"java_import(",
90+
" name = 'scala-library',",
91+
" jars = ['Scala/lib/scala-library.jar'],",
92+
")",
93+
"",
94+
"java_import(",
95+
" name = 'scala',",
96+
" jars = ['Scala/lib/scala-plugin.jar'],",
97+
" runtime_deps = [':scala-library'],",
98+
" visibility = ['//visibility:public'],",
99+
")"]),
100+
url = "https://plugins.jetbrains.com/files/1347/33637/scala-intellij-bin-2017.1.15.zip",
59101
)
60102

61103
# LICENSE: Common Public License 1.0

aswb/2.2/src/com/google/idea/blaze/android/compatibility/Compatibility.java

Lines changed: 0 additions & 138 deletions
This file was deleted.

0 commit comments

Comments
 (0)