summaryrefslogtreecommitdiff
path: root/src/intellij
Commit message (Collapse)AuthorAgeFilesLines
* Finish resolving conflicts from rebasing commits within #5661Dale Wijnand2017-02-011-24/+0
|
* Update IntelliJ template configurationJason Zaugg2017-01-278-105/+254
| | | | | | - Remove obsolete references to subproject for actors, forkjoin - Add a new subproject for the scalacheck suite, as spawned in the previous commit
* adjust to partest 1.1.0's new mixed Java/Scala compilationLukas Rytz2017-01-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | upgrades partest from 1.0.17 to 1.1.0 https://github.com/scala/scala-partest/pull/69 changed the mode for mixed compilation, which used to be 1. scalac *.java *.scala -d o 2. javac *.java -d o -cp o 3. scalac *.scala -d o -cp o Now the third step is skipped. This required some adjustments to existing tests. - t7014 is split in two groups, the fix is for separate compilation. - t7582 is also split. It tests inliner warnings when inling code that accesses Java-defined package-private code. Inlining from Java only works in separate compilation (no bytecode available in mixed compilation). - Java compiler warnings of "run" tests were not reported in the old scheme, now they are. Deprecation / unchecked warnings were removed from t6240, t8786, varargs. - t4788 required a .check file update to pass, which hints at a bug. I will re-open SI-4788 and investigate later.
* Upgrade to jline2 2.14.3Adriaan Moors2017-01-091-5/+5
|
* Merge pull request #5299 from mpociecha/improve-intellij-integrationAdriaan Moors2016-07-261-1/+1
|\ | | | | Improve sbt-based IntelliJ integration in case of Windows
| * Improve sbt-based IntelliJ integration in case of WindowsMichał Pociecha2016-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | Use File.pathSeparator when processing classpath instead of just : to don't end up with classpath like "C:\sth\a.jar:C:\sth\b.jar" what was causing problems after split(":"). Display questions first and then wait for user input. I tested on 3 computes and without flush the printed questions were always displayed just after user replied - never before.
* | SI-9560 Remove dependency on parser-combinators/jsonSimon Ochsenreither2016-07-221-40/+30
|/ | | | | | | Also update a few example IDE files for Eclipse and IntelliJ. This drops the dependency by integrating the bare minimum functionality to keep things working.
* Remove redundant 'the' in IntelliJ's README.mdMichał Pociecha2016-07-121-1/+1
|
* improve README (#5163)Lukas Rytz2016-05-181-16/+48
|
* SI-9762 Update to JLine 2.14.1Jason Zaugg2016-04-271-6/+6
| | | | | | | | | | | | | | | | Motivated by the improvements to multi-byte character handling. Screencast showing the reported bug is fixed: http://g.recordit.co/ie1Z367NUl.gif Here's the changelog since JLine 2.12.1: https://github.com/jline/jline2/compare/jline-2.12.1...jline-2.14.1 I needed to disable a new, on-by-default feature in JLine so that it didn't add a " " after completing the token `equals` in `foo.equa<TAB>`.
* Updates to IntelliJ files for 2.12.xLukas Rytz2016-03-212-32/+41
|
* Update IntelliJ build for use with sbtLukas Rytz2016-03-2123-234/+336
|
* upgrade to sbt 0.13.11Seth Tisue2016-02-221-46/+46
| | | | yum! delicious dogfood!
* Enable IntellIJ smarts while editing the buildJason Zaugg2016-02-072-1/+111
| | | | | | | | | | | | | | | | | | | | | | Even though our build can't be imported into IntelliJ automatically, we don't need to live in the dark ages of red squigglies when editing build.sbt. This commit hand-crafts the module defintion for the project, which has SBT and its dependendencies on the classpath. A screenshot of the code assist is worth the thousand expletives I uttered while writing the pictured code without this facility: https://www.dropbox.com/s/6mxv0iwxkhvnor7/Screenshot%202016-02-07%2022.09.12.png?dl=0 To download the sources for the SBT JARs that are referenced herein, run sbt> reload plugins sbt> updateClassifiers
* more readme improvementsSeth Tisue2015-10-082-12/+13
| | | | | | * be clearer about required JDK versions * eliminate redundancy with existing src/eclipse and src/intellij readmes * give IntelliJ readme a .md extension
* SI-8502 create PackageClass instead of Class symbol stubs for pkgsLukas Rytz2015-07-203-0/+3
| | | | | | | | | | | | | | | | | | | | https://github.com/scala/scala/pull/4111 creates a stub type symbol for missing packages, deferring (or avoiding) a crash if a package is missing. The symbol created was a ClassSymbol, which could lead to an assertion failure in flattten: case TypeRef(pre, sym, args) if isFlattenablePrefix(pre) => assert(args.isEmpty && sym.enclosingTopLevelClass != NoSymbol, sym.ownerChain) `pre` is the stub ClassSymbol, so `isFlattenablePrefix` is true (but it should be false). The assertion then fails because the enclosing class of a top-level class defined in a missing package is NoSymbol. This failed only with GenBCode, which traverses more of the symbol graph while building ClassBTypes: it looks collects the nested classes of `Outer` into a `NestedInfo`.
* intellij project files for ASM removalLukas Rytz2015-05-117-8/+15
| | | | ij fix
* Merge pull request #4488 from gbasler/topic/files-in-wrong-placeLukas Rytz2015-05-044-74/+0
|\ | | | | Cleanup files in wrong place
| * Move test files to the right place.Gerard Basler2015-05-034-74/+0
| |
* | Update intellij project files for IDEA 14.1 and latest Scala pluginLukas Rytz2015-05-0121-488/+175
|/ | | | | Removes the src/intellij-14 folder and moves everything back to src/intellij.
* Add an IntelliJ module for the Pax Exam based OSGi testsJason Zaugg2015-01-282-0/+24
| | | | We can now edit these in IntelliJ, as per the regular JUnit tests.
* Avoid the `CNF budget exceeded` exception via smarter translation into CNF.Gerard Basler2014-10-274-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The exhaustivity checks in the pattern matcher build a propositional formula that must be converted into conjunctive normal form (CNF) in order to be amenable to the following DPLL decision procedure. However, the simple conversion into CNF via negation normal form and Shannon expansion that was used has exponential worst-case complexity and thus even simple problems could become untractable. A better approach is to use a transformation into an _equisatisfiable_ CNF-formula (by generating auxiliary variables) that runs with linear complexity. The commonly known Tseitin transformation uses bi- implication. I have choosen for an enhancement: the Plaisted transformation which uses implication only, thus the resulting CNF formula has (on average) only half of the clauses of a Tseitin transformation. The Plaisted transformation uses the polarities of sub-expressions to figure out which part of the bi-implication can be omitted. However, if all sub-expressions have positive polarity (e.g., after transformation into negation normal form) then the conversion is rather simple and the pseudo-normalization via NNF increases chances only one side of the bi-implication is needed. I implemented only optimizations that had a substantial effect on formula size: - formula simplification, extraction of multi argument operands - if a formula is already in CNF then the Tseitin/Plaisted transformation is omitted - Plaisted via NNF - omitted: (sharing of sub-formulas is also not implemented) - omitted: (clause subsumption)
* IntelliJ project filesLukas Rytz2014-05-0217-71/+186
| | | | Fixes compilation within IDEA. Allows compiling and running JUnit tests directly withing the IDE.
* Modularize the swing library.Adriaan Moors2013-12-135-96/+0
| | | | | The Scala Swing library will still ship with 2.11 (albeit unsupported). It now resides at https://github.com/scala/scala-swing.
* Modularize continuations plugin.Adriaan Moors2013-12-133-50/+0
| | | | | The continuations plugin and library will still ship with 2.11 (albeit unsupported). They now reside at https://github.com/scala/scala-continuations.
* SI-7844 Intellij setup.sh is not working for Ubuntu 12.04jinfu-leng2013-09-151-1/+1
| | | | Added "-f" option to the command "rm"
* Move partest to https://github.com/scala/scala-partestAdriaan Moors2013-08-201-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As partest is now resolved from maven, `test/partest` uses `ant test.suite.init` to determine the classpath (serialized to build/pack/partest.properties) that's necessary to run `scala.tools.partest.nest.ConsoleRunner`. Thus, partest gets exactly the same classpath, whether run from the command line through `test/partest` or via `ant test`. The version of partest we're using is specified by properties defined in versions.properties (formerly `starr.number`). Currently, we're using: ``` scala.binary.version=2.11.0-M4 partest.version.number=1.0-RC3 ``` NOTES: - The version of Scala being tested must be backwards binary compatible with the version of Scala that was used to compile partest. - Once 2.11 goes final, `scala.binary.version=2.11`, and `starr.version=2.11.0`. - Need scalacheck on classpath for test/partest scalacheck tests. - Removed atrophied ant tests (haven't been run/changed for at least two years I checked 81d659141a as a "random" sample). - Removed scalacheck. It's resolved as a partest dependency. - For now, use a locally built scalap - Kept the trace macro in the main repo (partest-extras) - New targets for faster pr validation: test-core-opt, test-stab-opt - Reused partest eclipse/intellij project to partest-extras (note: the partest dependency is hard-coded)
* Scrubbing up the IntelliJ ConfigJason Zaugg2013-07-2915-23/+137
| | | | | | | | | | | | - Add recently sprouted modules (xml and parser-combinators) - Replace some of the documentation with a setup script - Update Ant build to copy Maven sourced JARs to ./build/deps. These are included in the IntelliJ classpath. - Define the library for Ant at the project level based on ./lib, rather than asking the user to define global library. - Disable Type Aware Highlighting by default. IntelliJ now can build everything within the IDE with CTRL-F9.
* An IntelliJ Module for the recently modularized REPL.Jason Zaugg2013-03-252-0/+26
|
* IntellIiJ module definitions for scaladoc, interactive and continuations-*.Jason Zaugg2013-03-105-0/+101
|
* Merge commit 'refs/pull/1718/head' into merge-msil-genjvm-deletePaul Phillips2012-12-064-27/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'refs/pull/1718/head': Expunged the .net backend. Conflicts: build.detach.xml build.examples.xml build.xml project/Build.scala src/compiler/scala/tools/ant/Scalac.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala src/compiler/scala/tools/nsc/transform/Mixin.scala src/intellij/compiler.iml.SAMPLE tools/buildcp
| * Expunged the .net backend.Paul Phillips2012-12-054-27/+0
| | | | | | | | | | | | | | | | It lives on in a branch born from this commit's parent. It's abrupt; no attempt is made to offer a "smooth transition" for the serious msil userbase, population zero. If anyone feels very strongly that such a transition is necessary, I will be happy to talk you into feeling differently.
* | SI-6769 Removes GenJVM backendJames Iry2012-12-054-16/+0
|/ | | | | Get rid of GenJVM and everything that refers to it. Also get rid of GenAndroid since it's dead code that refers to GenJVM.
* updated intellij project filesLukas Rytz2012-07-1615-41/+107
|
* An IntelliJ module for reflect.Jason Zaugg2012-06-093-1/+27
|
* An IntelliJ module for test files.Jason Zaugg2012-05-173-20/+17
| | | | | | | This enables resolve, autocompletion and the usual goodness when editing tests. Also removes the sample configuration for the defunct dbc module.
* Good-bye, scala.dbc.Paul Phillips2012-04-202-4/+0
| | | | Another deprecated soul passes on to ether world.
* An IntelliJ module for the root directory.Jason Zaugg2012-02-042-1/+12
| | | | This allows any file to be be edited, rather than just the ones under library, compiler, actors, ...
* update intellij files, no reviewLukas Rytz2011-01-262-5/+12
|
* Updated IntelliJ sample files. no review.Lukas Rytz2010-10-1110-494/+70
|
* updated intellij project SAMPLE files to new fa...Lukas Rytz2010-08-069-96/+43
| | | | | | | updated intellij project SAMPLE files to new facet configuration. uses 'palo' right now because a .jar (scala-compiler.jar) is required, a directory does not work. no review.
* updated intellij project file samplesLukas Rytz2010-07-229-1166/+459
|
* Renamed Idea project files to have a .SAMPLE su...Iulian Dragos2010-05-039-0/+0
| | | | | | Renamed Idea project files to have a .SAMPLE suffix. Having to constantly remove them from each commit was too cumbersome.
* More progress toward immutable Settings, and va...Paul Phillips2010-03-081-1/+1
| | | | | | More progress toward immutable Settings, and various cleanups encountered along the way. No review.
* A few yards short of the goal posts attempt at ...Paul Phillips2010-03-041-1/+1
| | | | | | | | | | | A few yards short of the goal posts attempt at making our usage of Throwable subclasses more consistent. This patch eliminates a lot of ad hoc Exception/Error/etc. creation and various arbitrary choices are rendered slightly less arbitrary. From now on let's try not to use the word "Exception" or "Error" in the names of Throwable subclasses unless they actually derive (and make sense to derive) from Exception or Error. Review by community.
* IntelliJ project metadata updated for new locat...Miles Sabin2010-02-079-1180/+1098
| | | | | | IntelliJ project metadata updated for new location. Thanks to Tony Coates for the patch.
* No longer are there more IDE-specific junk file...Paul Phillips2010-01-209-0/+1717
No longer are there more IDE-specific junk files in the root directory of the official scala repository than actual scala files and directories put together. It's a truly awful first impression to give potential developers so I'm interpreting the non-response regarding the need for them as quiet encouragement to put them in src/intellij. Review by ilyas.
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-16 00:03:59 +0000