You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/09/16 18:21:10 UTC

git commit: [SPARK-2182] Scalastyle rule blocking non ascii characters.

Repository: spark
Updated Branches:
  refs/heads/master 61e21fe7f -> 7b8008f5a


[SPARK-2182] Scalastyle rule blocking non ascii characters.

...erators.

Author: Prashant Sharma <pr...@imaginea.com>

Closes #2358 from ScrapCodes/scalastyle-unicode and squashes the following commits:

12a20f2 [Prashant Sharma] [SPARK-2182] Scalastyle rule blocking (non keyboard typeable) unicode operators.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7b8008f5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7b8008f5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7b8008f5

Branch: refs/heads/master
Commit: 7b8008f5a4d413b61aa88fbc60959e98e59f17dd
Parents: 61e21fe
Author: Prashant Sharma <pr...@imaginea.com>
Authored: Tue Sep 16 09:21:03 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Tue Sep 16 09:21:03 2014 -0700

----------------------------------------------------------------------
 .../scalastyle/NonASCIICharacterChecker.scala   | 39 ++++++++++++++++++++
 scalastyle-config.xml                           |  1 +
 2 files changed, 40 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/7b8008f5/project/spark-style/src/main/scala/org/apache/spark/scalastyle/NonASCIICharacterChecker.scala
----------------------------------------------------------------------
diff --git a/project/spark-style/src/main/scala/org/apache/spark/scalastyle/NonASCIICharacterChecker.scala b/project/spark-style/src/main/scala/org/apache/spark/scalastyle/NonASCIICharacterChecker.scala
new file mode 100644
index 0000000..3d43c35
--- /dev/null
+++ b/project/spark-style/src/main/scala/org/apache/spark/scalastyle/NonASCIICharacterChecker.scala
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.spark.scalastyle
+
+import java.util.regex.Pattern
+
+import org.scalastyle.{PositionError, ScalariformChecker, ScalastyleError}
+
+import scalariform.lexer.Token
+import scalariform.parser.CompilationUnit
+
+class NonASCIICharacterChecker extends ScalariformChecker {
+  val errorKey: String = "non.ascii.character.disallowed"
+
+  override def verify(ast: CompilationUnit): List[ScalastyleError] = {
+    ast.tokens.filter(hasNonAsciiChars).map(x => PositionError(x.offset)).toList
+  }
+
+  private def hasNonAsciiChars(x: Token) =
+    x.rawText.trim.nonEmpty && !Pattern.compile( """\p{ASCII}+""", Pattern.DOTALL)
+    .matcher(x.text.trim).matches()
+
+}

http://git-wip-us.apache.org/repos/asf/spark/blob/7b8008f5/scalastyle-config.xml
----------------------------------------------------------------------
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
index 76ba1ec..c54f8b7 100644
--- a/scalastyle-config.xml
+++ b/scalastyle-config.xml
@@ -140,5 +140,6 @@
  <!-- <check level="error" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="true"></check> -->
  <check level="error" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check>
  <check level="error" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"></check>
+ <check level="error" class="org.apache.spark.scalastyle.NonASCIICharacterChecker" enabled="true"></check>
  <check level="error" class="org.apache.spark.scalastyle.SparkSpaceAfterCommentStartChecker" enabled="true"></check>
 </scalastyle>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org