Add Rule configuration: DisableSyntax.regex #494

MasseGuillaume · 2017-12-10T15:41:14Z

No description provided.

olafurpg

Nice! LGTM 👍

olafurpg · 2017-12-11T09:15:20Z

scalafix-core/shared/src/main/scala/scalafix/internal/rule/DisableSyntax.scala

+      }
+    }
+    val tokensLintMessage =
+      ctx.tree.tokens.collect {


s/.collect/.traverse/ and build directly to regexLintMessages? Either way is fine.

olafurpg · 2017-12-11T09:17:11Z

scalafix-core/shared/src/main/scala/scalafix/internal/util/IntervalSet.scala

@@ -10,16 +10,40 @@ class IntervalSet(range: BitSet) {
    val otherRange = BitSet((start to end): _*)
    (range & otherRange).nonEmpty
  }
+
+  override def toString: String = {


As a general note, it's best to try and open separate PRs for unrelated changes. I know it requires more fiddling with branches locally but it makes it easier to review, esp. for larger PRs at least. It's fine here, just wanted to mention this.

olafurpg · 2017-12-11T13:03:38Z

scalafix-tests/input/src/main/scala/test/DisableSyntax.scala

  def foo: Unit = return    // assert: DisableSyntax.keywords.return
  throw new Exception("ok") // assert: DisableSyntax.keywords.throw

  "semicolon";              // assert: DisableSyntax.noSemicolons
  <a>xml</a>                // assert: DisableSyntax.noXml
 	                          // assert: DisableSyntax.noTabs
+
+  implicit class StringPimp(value: String) { // assert: DisableSyntax.[P|p]imp


Hmm, I wonder if CustomMessage should have an optional id field to avoid exposing complex messages like this into linter messages. Opened #495

Before: scala/test/DisableSyntax.scala:21:3: error: [DisableSyntax.keywords.null]: keywords.null is disabled null ^ Now: scala/test/DisableSyntax.scala:21:3: error: [DisableSyntax.keywords.null]: null is disabled null ^

``` > scalafix --diff-base <tab> HEAD ag/gh-pages ag/issue-260 ag/issue-319 ag/master ... v0.5.5 v0.5.6 |00| 51abefa -- wip improve sbt completion (13 hours ago) |01| 3f63b5b -- Merge pull request scalacenter#474 from marcelocenerine/trim_includeNewLine (13 hours ago) |02| 47b94c0 -- Add leadingSpaces/trailingSpaces methods to TokenList (13 hours ago) |03| 8bd026d -- Merge pull request scalacenter#503 from MasseGuillaume/feature/368-escape-patches (13 hours ago) |04| 20e445f -- Escape hatch on Patch (fix scalacenter#368) (13 hours ago) |05| a2c5d70 -- Merge pull request scalacenter#500 from MasseGuillaume/feature/495-custom-id (13 hours ago) |06| 59efe7d -- Add CustomMessage to the public api (13 hours ago) |07| 9ae6071 -- Add id for CustomMessage (fix scalacenter#495) (13 hours ago) |08| e4a5c35 -- Merge pull request scalacenter#494 from MasseGuillaume/disable-regex (13 hours ago) |09| a422860 -- Merge pull request scalacenter#497 from olafurpg/disable-signatures (13 hours ago) |10| 7930947 -- DisableSyntax add regex (13 hours ago) |11| 5dbdd6b -- IntervalSet test for empty and add toString (13 hours ago) |12| b022fbd -- DisableSyntax don't repeat DisableSyntax.keyword in message (13 hours ago) |13| a992b02 -- Assert instead of scalafix:ok (13 hours ago) |14| 7896ccd -- Refactor Disable to use views. (13 hours ago) |15| 58acdbe -- Fix scalacenter#493, handle synthetics and symbol signatures in Disable. (13 hours ago) |16| b48d7f0 -- Merge pull request scalacenter#490 from olafurpg/unmanagedSources (13 hours ago) |17| e9b2b0a -- s/canFormat/canFix/ (13 hours ago) |18| 26be6fa -- Use unmanagedSources instead of unmanagedSourceDirectories. (13 hours ago) |19| 4d46001 -- Merge pull request scalacenter#488 from olafurpg/master (13 hours ago) ```

MasseGuillaume force-pushed the disable-regex branch from 080c867 to db34507 Compare December 10, 2017 15:42

MasseGuillaume added the ready label Dec 10, 2017

MasseGuillaume requested a review from olafurpg December 10, 2017 15:42

olafurpg approved these changes Dec 11, 2017

View reviewed changes

MasseGuillaume force-pushed the disable-regex branch 2 times, most recently from 5c844b5 to 3adaad7 Compare December 11, 2017 18:05

MasseGuillaume added 2 commits December 12, 2017 15:48

DisableSyntax don't repeat DisableSyntax.keyword in message

b022fbd

Before: scala/test/DisableSyntax.scala:21:3: error: [DisableSyntax.keywords.null]: keywords.null is disabled null ^ Now: scala/test/DisableSyntax.scala:21:3: error: [DisableSyntax.keywords.null]: null is disabled null ^

IntervalSet test for empty and add toString

5dbdd6b

MasseGuillaume force-pushed the disable-regex branch from 3adaad7 to 2cfe4da Compare December 12, 2017 15:11

DisableSyntax add regex

7930947

MasseGuillaume force-pushed the disable-regex branch from 2cfe4da to 7930947 Compare December 12, 2017 15:19

olafurpg merged commit e4a5c35 into scalacenter:master Dec 12, 2017

MasseGuillaume deleted the disable-regex branch December 12, 2017 15:34

olafurpg mentioned this pull request Dec 15, 2017

Extend DisableSyntax Rule to Regex #436

Closed

MasseGuillaume changed the title ~~Add regex to the DisableSyntax rule~~ Add Rule configuration: DisableSyntax.regex Jan 25, 2018

MasseGuillaume added this to the v0.5.8 milestone Jan 25, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Rule configuration: DisableSyntax.regex #494

Add Rule configuration: DisableSyntax.regex #494

MasseGuillaume commented Dec 10, 2017

olafurpg left a comment

olafurpg Dec 11, 2017

olafurpg Dec 11, 2017

olafurpg Dec 11, 2017

Add Rule configuration: DisableSyntax.regex #494

Add Rule configuration: DisableSyntax.regex #494

Conversation

MasseGuillaume commented Dec 10, 2017

olafurpg left a comment

Choose a reason for hiding this comment

olafurpg Dec 11, 2017

Choose a reason for hiding this comment

olafurpg Dec 11, 2017

Choose a reason for hiding this comment

olafurpg Dec 11, 2017

Choose a reason for hiding this comment