summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* SI-8040 Improve unused warningsSom Snytt2017-03-113-28/+101
| | | | | | | Add symbol names, don't warn for both getters and setters or for synthetics (except default arg getters). Tweak messages for readability.
* Merge pull request #5675 from piyush-jaiswal/issue/9729som-snytt2017-03-102-2/+175
|\ | | | | Add tests for ConsoleReporter.
| * Add tests for ConsoleReporter.piyush-jaiswal2017-03-112-2/+175
| |
* | Merge pull request #5761 from lrytz/sd329Adriaan Moors2017-03-103-7/+91
|\ \ | | | | | | Don't use `equals` for comparing java.lang.Double/Float
| * | Don't use `equals` for comparing java.lang.Double/FloatLukas Rytz2017-03-093-7/+91
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/scala/scala-dev/issues/329 The `equals` method for java.lang.Double/Float behaves differently than comparing the `doubleValue`s / `floatValues` for `-0.0`/`0.0`/`NaN`.
* | | Merge pull request #5719 from retronym/ticket/10187Adriaan Moors2017-03-102-2/+48
|\ \ \ | | | | | | | | SI-10187 Support mutation of mutable.HashMap in getOrElseUpdate
| * | | SI-10187 Support mutation of mutable.HashMap in getOrElseUpdateJason Zaugg2017-03-032-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scala 2.12.1 included optimizations to `HashMape.getOrElseUpdate` to avoid recomputing the index in the hash table when adding an the element. However, this index could be stale if the callback added elements to the map and triggered a resize. This commit checks that the table is unchanged before reusing the index, restoring the 2.12.0 behaviour.
* | | | Merge pull request #5767 from som-snytt/issue/5621Adriaan Moors2017-03-102-2/+11
|\ \ \ \ | | | | | | | | | | SI-5621 Missing implicits are supplied by defaults
| * | | | SI-5621 Missing implicits are supplied by defaultsSom Snytt2017-03-102-2/+11
| | | | | | | | | | | | | | | | | | | | Make a note in the examples for default args.
* | | | | Merge pull request #5769 from som-snytt/issue/8969Lukas Rytz2017-03-102-2/+14
|\ \ \ \ \ | | | | | | | | | | | | SI-8969 Accept poly+implicit for assignment syntax
| * | | | | SI-8969 Accept poly+implicit for assignment syntaxSom Snytt2017-03-092-2/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to fb061f22d4c35df626d9651e017820a11f8fe56e which allowed the type param only. Reported: ``` scala> object Test { | def a[R](implicit s: List[R]):Int = 0 | def a_=[R](v: Int)(implicit s: List[R]) = () | } ```
* | | | | Merge pull request #5766 from lrytz/versionsReadmeSeth Tisue2017-03-091-10/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | | Adapt README to new version numbers
| * | | | Adapt README to new version numbersLukas Rytz2017-03-091-10/+12
| |/ / /
* | | | Merge pull request #5765 from lrytz/bootstrapReposLukas Rytz2017-03-091-3/+4
|\ \ \ \ | |/ / / |/| | | Fix for repositories file in bootstrap scripts
| * | | Fix for repositories file in bootstrap scriptsLukas Rytz2017-03-091-3/+4
|/ / / | | | | | | | | | | | | | | | When building quick and modules, the `scala-integrate` repo needs to be there in order to find other modules. For example, partest needs xml. This should fix the 2.13 build, it didn't fail in 2.12 because modules are not built.
* | | Merge pull request #5757 from lrytz/bootstrap-scriptLukas Rytz2017-03-085-128/+114
|\ \ \ | | | | | | | | new version numbers for snapshot and integration builds, new repository
| * | | new version numbers for snapshot and integration builds, new repositoryLukas Rytz2017-03-085-128/+114
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Integration builds now have version number like `2.12.2-bin-sha7` or `2.13.0-pre-sha7` and are published to scala-integration (no longer scala-release-temp). scala-release-temp is still used in the bootstrap script for publishing intermediate artifacts (starr, locker). Various cleanups in the scripts.
* | | Merge pull request #5733 from szeiger/wip/use-jgitSeth Tisue2017-03-076-72/+33
|\ \ \ | | | | | | | | Get commit SHA and date with JGit
| * | | Get commit SHA and date with JGitStefan Zeiger2017-02-286-72/+33
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to get the SHA and date we used to run shell scripts and parse the output of `git` commands. On Windows we even ran a batch file that looked for `bash.exe` and then ran the shell script in bash. Using JGit should be more robust than the old Rube Goldberg implementation. The values produced are the same, except for the time zone. Previously the timestamp was formatted with the local timezone, now we use UTC.
* | | Merge pull request #5600 from paplorinc/HashTable_indexSeth Tisue2017-03-065-18/+21
|\ \ \ | | | | | | | | Further small HashTable optimizations
| * | | Optimized HashTable.nextPositivePowerOfTwoPap Lőrinc2017-02-185-18/+21
| | |/ | |/|
* | | Merge pull request #5754 from Philippus/issue/html-tag-in-hoverLukas Rytz2017-03-043-30/+25
|\ \ \ | | | | | | | | fix regression in scaladoc
| * | | pattern for entitylink was too narrow, cleaned up the testsPhilippus Baalman2017-03-033-30/+25
| | | |
* | | | Merge pull request #5671 from retronym/topic/stubby-2Lukas Rytz2017-03-035-7/+68
|\ \ \ \ | | | | | | | | | | Avoid compiler crash with missing transitive dependencies
| * | | | Remove non-essential fix for stub symbol failureJason Zaugg2017-03-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Given that we correctly setup the flags on the stub symbol, we no longer trip an assertion in ModuleTypeRef's constructor.
| * | | | Avoid forcing info transforms of primitive methodsJason Zaugg2017-02-192-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although this is cheap, when debugging log output of info transformer activity this was a major source of noise. This commit avoids the info lookup for methods other than `+`, and then for `+` uses the typer phase info to distinguish concatentation from addition.
| * | | | Avoid stub symbol related crash in backendJason Zaugg2017-02-194-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this test case, the backend forces the specialization info transform of `Sub` during computation of its inner class metadata. This in turn runs the info transforms of the `Base`. This leads to the uncurry info tranform transforming a signature that has a type alias as a method parameter type. Subsequent substution of the new method symbol into the result type, which includes a stub symbol for an absent class, tripped an assertion: ``` requirement failed: package b java.lang.IllegalArgumentException: requirement failed: package b at scala.Predef$.require(Predef.scala:277) at scala.reflect.internal.Types$ModuleTypeRef.<init>(Types.scala:1879) at scala.reflect.internal.Types$PackageTypeRef.<init>(Types.scala:1897) at scala.reflect.internal.Types$TypeRef$.apply(Types.scala:2401) at scala.reflect.internal.Types.typeRef(Types.scala:3553) at scala.reflect.internal.Types.typeRef$(Types.scala:3536) at scala.reflect.internal.SymbolTable.typeRef(SymbolTable.scala:16) at scala.reflect.internal.Symbols$TypeSymbol.newTypeRef(Symbols.scala:3026) at scala.reflect.internal.Symbols$TypeSymbol.updateTypeCache(Symbols.scala:3079) at scala.reflect.internal.Symbols$TypeSymbol.maybeUpdateTypeCache(Symbols.scala:3065) at scala.reflect.internal.Symbols$TypeSymbol.tpe_$times(Symbols.scala:3043) at scala.reflect.internal.Symbols$Symbol.typeOfThis(Symbols.scala:2020) at scala.reflect.internal.Types$ThisType.underlying(Types.scala:1184) at scala.reflect.internal.Types$SimpleTypeProxy.boundSyms(Types.scala:150) at scala.reflect.internal.Types$SimpleTypeProxy.boundSyms$(Types.scala:150) at scala.reflect.internal.Types$SingletonType.boundSyms(Types.scala:1088) at scala.reflect.internal.tpe.TypeMaps$SubstMap.apply(TypeMaps.scala:726) at scala.reflect.internal.tpe.TypeMaps$SubstSymMap.apply(TypeMaps.scala:789) at scala.reflect.internal.tpe.TypeMaps$TypeMap.mapOver(TypeMaps.scala:102) at scala.reflect.internal.tpe.TypeMaps$SubstSymMap.apply(TypeMaps.scala:783) at scala.reflect.internal.tpe.TypeMaps$TypeMap.mapOver(TypeMaps.scala:102) at scala.reflect.internal.tpe.TypeMaps$SubstSymMap.apply(TypeMaps.scala:783) at scala.reflect.internal.Types$Type.substSym(Types.scala:727) at scala.reflect.internal.tpe.TypeMaps$TypeMap.mapOver(TypeMaps.scala:123) at scala.reflect.internal.transform.UnCurry$$anon$1.apply(UnCurry.scala:53) at scala.reflect.internal.transform.UnCurry.transformInfo(UnCurry.scala:154) ``` This commit address the direct failure above by setting coherent flags on the stub package class symbol (it also needs the MODULE flag).
* | | | | Merge pull request #5622 from edmundnoble/extra-errsAdriaan Moors2017-03-027-39/+74
|\ \ \ \ \ | | | | | | | | | | | | Improved error messages for identically named, differently prefixed types
| * | | | | Match error lengthsEdmund Noble2017-02-072-3/+6
| | | | | |
| * | | | | Improved error messages for identically named, differently prefixed typesEdmund Noble2016-12-317-39/+71
| | | | | |
* | | | | | Merge pull request #5728 from Philippus/issue/html-tag-in-hoverLukas Rytz2017-03-026-32/+90
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | | inlineToStr is not exhaustive and does not remove html tags inside HtmlTag [ci: last-only]
| * | | | added missing Inline matches to inlineToStr so it is now exhaustivePhilippus Baalman2017-02-256-32/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scala.xml.XML.loadString(tag).text will remove all html tags inside the HtmlTag use a regex to remove html tags inside the tag added some tests for the inlineToStr-method moved inlineToStr to companion object of Page added test for nested html tags
* | | | | Merge pull request #5743 from som-snytt/issue/10207-bad-updateLukas Rytz2017-02-273-5/+26
|\ \ \ \ \ | | | | | | | | | | | | SI-10207 Error before update conversion
| * | | | | SI-10207 Error before update conversionSom Snytt2017-02-263-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gaze deeper for errors before committing to conversion of assignment to update. The error buried in the transformed tree escapes notice of retypechecking and leaks to backend.
* | | | | | Merge pull request #5746 from paulp/pr/partestLukas Rytz2017-02-272-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add partest paths to the list of watched sources.
| * | | | | Add partest paths to the list of watched sources.Paul Phillips2017-02-262-0/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | This allows running partest continuously (e.g. ~partest a/b/test) with it triggering on changes to the test source.
* | | | | Merge pull request #5732 from retronym/topic/build-info-malarkeyAdriaan Moors2017-02-241-0/+4
|\ \ \ \ \ | | | | | | | | | | | | More predictable performance of SBT build startup, reload
| * | | | | More predictable performance of SBT build startup, reloadJason Zaugg2017-02-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable parallelism to avoid a nasty interaction between the SBT build info plugin, which internally uses `EvaluateTask`, and can get into a race condition with other concurrnently running tasks. This could be seen as frequent, unnecessary Ivy resolution during the `reload` command, even when nothing had changed. Gory details in https://github.com/sbt/sbt/issues/2970
* | | | | | Merge pull request #5735 from SethTisue/sd-313Adriaan Moors2017-02-241-12/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | increase timeouts on some sys.process tests
| * | | | | | increase timeouts on some sys.process testsSeth Tisue2017-02-231-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these were occasionally timing out on our Windows CI reference: https://github.com/scala/scala-dev/issues/313
* | | | | | | Merge pull request #5723 from dragos/issue/regression-assert-ideLukas Rytz2017-02-241-5/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix regression introduced by 5751763
| * | | | | | Fix regression in 5751763Iulian Dragos2017-02-221-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enterClass/Module may return an existing symbol, but in 5751763 the return value was dropped leading to assertion failures. This may show up only in the presentation compiler, which explains why it went unnoticed. Here's what needs to happen: - a class with a companion is loaded by the IDE, but the class name is different than the file name. This is from source - the same class and companion object exist as binary, and are loaded from classfiles when the package is completed (since they have different names than the source file, the classpath abstraction will only "know" that there is a classfile, and no corresponding source file) It seems that companionClass always prefers to return the companion defined in a source file, but if this assertion is called from the code path that tries to load the binary version, the newly created module will not match.
* | | | | | | Merge pull request #5731 from janekdb/issue/GH-644/fix-spec-latex-renderingSeth Tisue2017-02-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | GH-644: Remove static html styling of spec code blocks
| * | | | | | | GH-644: Remove static html styling of spec code blocksJanek Bogucki2017-02-231-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this Jekyll configuration change code blocks were being marked up in a ways that disrupted MathJax styling. Tested as far a possible locally. Confidence mainly drawn from html comparison to working 2.11.x version.
* | | | | | | Merge pull request #5729 from scala/revert-5658-topic/hashhashAdriaan Moors2017-02-223-24/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Revert "Fix erasure of the qualifier of ##"
| * | | | | | Revert "Fix erasure of the qualifier of ##"Adriaan Moors2017-02-223-24/+6
|/ / / / / /
* | | | | | Merge pull request #5681 from Philippus/issue/9704Lukas Rytz2017-02-223-3/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-9704 don't add a closing HtmlTag if it is already closed
| * | | | | | moved Pattern and TagsNotToClose to a HtmlTag companion objectPhilippus Baalman2017-02-211-4/+6
| | | | | | |
| * | | | | | SI-9704 don't add a closed HtmlTag if it is already closedPhilippus Baalman2017-02-083-1/+29
| | | | | | |
* | | | | | | Merge pull request #5726 from scala/revert-5629-issue/10120-quote-errAdriaan Moors2017-02-2116-84/+76
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revert "SI-10133 Require escaped single quote char lit"
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 20:08:25 +0000