Skip to content

Commit a6d9d3c

Browse files
author
Daniel Trinh
committed
merge in master from daniel-trinh
2 parents 9a478cf + 2311d0c commit a6d9d3c

File tree

108 files changed

+611
-471
lines changed

Some content is hidden

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

108 files changed

+611
-471
lines changed

‎CHANGELOG‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
0.1.6 (17/Jan/15)
2+
* FIX: FQN package name changed from scalariform to com.danieltrinh.scalariform to avoid dependency collision with prior mdr/scalariform fork
3+
14
0.1.5 (4/May/14)
25
* FIX: Type formatter crash on multiline types
36
* Track scalac parser -- allow trait-position parents to have parameter blocks

cli/src/main/scala/scalariform/commandline/CommandLineOptionParser.scala renamed to cli/src/main/scala/com/danieltrinh/scalariform/commandline/CommandLineOptionParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scalariform.commandline
1+
package com.danieltrinh.scalariform.commandline
22

33
import scala.util.parsing.input._
44
import scala.util.parsing.combinator._

cli/src/main/scala/scalariform/commandline/Main.scala renamed to cli/src/main/scala/com/danieltrinh/scalariform/commandline/Main.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package scalariform.commandline
1+
package com.danieltrinh.scalariform.commandline
22

33
import java.io.File
44
import java.io.IOException
55
import java.nio.charset._
66
import scala.io.Source
7-
import scalariform.formatter.preferences._
8-
import scalariform.formatter.ScalaFormatter
9-
import scalariform.parser.ScalaParserException
10-
import scalariform.utils.Utils._
11-
import scalariform.ScalaVersions
7+
import com.danieltrinh.scalariform.formatter.preferences._
8+
import com.danieltrinh.scalariform.formatter.ScalaFormatter
9+
import com.danieltrinh.scalariform.parser.ScalaParserException
10+
import com.danieltrinh.scalariform.utils.Utils._
11+
import com.danieltrinh.scalariform.ScalaVersions
1212

1313
object Main {
1414

cli/src/main/scala/scalariform/commandline/ScalaFileWalker.scala renamed to cli/src/main/scala/com/danieltrinh/scalariform/commandline/ScalaFileWalker.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scalariform.commandline
1+
package com.danieltrinh.scalariform.commandline
22

33
import java.io.File
44
import java.util.{ ArrayList, Collection }

‎misc/.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
<nature>org.scala-ide.sdt.core.scalanature</nature>
1010
<nature>org.eclipse.jdt.core.javanature</nature>
1111
</natures>
12-
</projectDescription>
12+
</projectDescription>

misc/src/main/scala/scalariform/corpusscan/CorpusScanner.scala renamed to misc/src/main/scala/com/danieltrinh/scalariform/corpusscan/CorpusScanner.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package scalariform.corpusscan
1+
package com.danieltrinh.scalariform.corpusscan
22

33
import java.io.File
44

55
import scala.io.Source
66

77
import org.apache.commons.io.FileUtils
88

9-
import scalariform.commandline.ScalaFileWalker
10-
import scalariform.formatter._
11-
import scalariform.formatter.preferences.FormattingPreferences
12-
import scalariform.lexer._
13-
import scalariform.parser._
14-
import scalariform.utils.Utils.writeText
9+
import com.danieltrinh.scalariform.commandline.ScalaFileWalker
10+
import com.danieltrinh.scalariform.formatter._
11+
import com.danieltrinh.scalariform.formatter.preferences.FormattingPreferences
12+
import com.danieltrinh.scalariform.lexer._
13+
import com.danieltrinh.scalariform.parser._
14+
import com.danieltrinh.scalariform.utils.Utils.writeText
1515

1616
sealed trait ParseFault
1717
case object TokensDoNotCoverSource extends ParseFault
@@ -105,4 +105,4 @@ object Runner {
105105
}
106106
println(count + " files formatted.")
107107
}
108-
}
108+
}

misc/src/main/scala/scalariform/gui/FormatterFrame.scala renamed to misc/src/main/scala/com/danieltrinh/scalariform/gui/FormatterFrame.scala

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scalariform.gui
1+
package com.danieltrinh.scalariform.gui
22

33
import java.awt.event._
44
import java.awt.{ List ⇒ _, _ }
@@ -13,16 +13,16 @@ import javax.swing.border.TitledBorder
1313
import net.miginfocom.layout._
1414
import net.miginfocom.swing._
1515

16-
import scalariform.astselect._
17-
import scalariform.utils.Utils._
18-
import scalariform.utils.Range
19-
import scalariform.parser._
20-
import scalariform.formatter._
21-
import scalariform.formatter.preferences._
22-
import scalariform.lexer._
23-
import scalariform.lexer.Tokens._
24-
import scalariform.gui.SwingUtils._
25-
import scalariform.parser._
16+
import com.danieltrinh.scalariform.astselect._
17+
import com.danieltrinh.scalariform.utils.Utils._
18+
import com.danieltrinh.scalariform.utils.Range
19+
import com.danieltrinh.scalariform.parser._
20+
import com.danieltrinh.scalariform.formatter._
21+
import com.danieltrinh.scalariform.formatter.preferences._
22+
import com.danieltrinh.scalariform.lexer._
23+
import com.danieltrinh.scalariform.lexer.Tokens._
24+
import com.danieltrinh.scalariform.gui.SwingUtils._
25+
import com.danieltrinh.scalariform.parser._
2626
import scala.util.parsing.input._
2727
import scala.util.parsing.combinator._
2828

@@ -396,7 +396,8 @@ class FormatterFrame extends JFrame with SpecificFormatter {
396396

397397
val productions = List(
398398
new ProductionItem("Compilation unit or script", compilationUnitFormatter),
399-
new ProductionItem("Expression", expressionFormatter))
399+
new ProductionItem("Expression", expressionFormatter)
400+
)
400401

401402
override def getSize = productions.size
402403
override def getElementAt(index: Int) = productions(index)

misc/src/main/scala/scalariform/gui/Main.scala renamed to misc/src/main/scala/com/danieltrinh/scalariform/gui/Main.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package scalariform.gui
1+
package com.danieltrinh.scalariform.gui
22

3-
import scalariform.utils.Utils._
3+
import com.danieltrinh.scalariform.utils.Utils._
44
import javax.swing.JFrame
55

66
object Main {
@@ -13,4 +13,4 @@ object Main {
1313
frame.setVisible(true)
1414
}
1515
}
16-
}
16+
}

misc/src/main/scala/scalariform/gui/ParseTreeModel.scala renamed to misc/src/main/scala/com/danieltrinh/scalariform/gui/ParseTreeModel.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package scalariform.gui
1+
package com.danieltrinh.scalariform.gui
22

33
import javax.swing.event.TreeModelListener
44
import javax.swing.tree._
5-
import scalariform.lexer.Token
6-
import scalariform.parser.AstNode
7-
import scalariform.utils.Range
5+
import com.danieltrinh.scalariform.lexer.Token
6+
import com.danieltrinh.scalariform.parser.AstNode
7+
import com.danieltrinh.scalariform.utils.Range
88

99
class ParseTreeModel(rootAstNode: AstNode) extends TreeModel {
1010

misc/src/main/scala/scalariform/gui/SwingUtils.scala renamed to misc/src/main/scala/com/danieltrinh/scalariform/gui/SwingUtils.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scalariform.gui
1+
package com.danieltrinh.scalariform.gui
22

33
import javax.swing.event.ListSelectionListener
44
import javax.swing.event.ListSelectionEvent
@@ -9,4 +9,4 @@ object SwingUtils {
99
def valueChanged(e: ListSelectionEvent) = handler(e)
1010
}
1111

12-
}
12+
}

0 commit comments

Comments
 (0)