Permalink
Browse files

Add space fix from conformance issue

  • Loading branch information...
1 parent 3963804 commit 7dca3946b57ee4ed0e5e01c6be9e6e0ded73e82d Matt Sanford committed Mar 5, 2010
Showing with 36 additions and 98 deletions.
  1. +1 −1 src/com/twitter/Regex.java
  2. +35 −97 twitter-text-java.iws
@@ -14,7 +14,7 @@
/* URL related hash regex collection */
private static final String URL_VALID_PRECEEDING_CHARS = "(?:[^/\"':!=]|^|\\:)";
- private static final String URL_VALID_DOMAIN = "(?:[\\.-]|[^\\p{Punct}])+\\.[a-z]{2,}(?::[0-9]+)?";
+ private static final String URL_VALID_DOMAIN = "(?:[\\.-]|[^\\p{Punct}\\s])+\\.[a-z]{2,}(?::[0-9]+)?";
private static final String URL_VALID_URL_PATH_CHARS = "[a-z0-9!\\*'\\(\\);:&=\\+\\$/%#\\[\\]\\-_\\.,~]";
// Valid end-of-path chracters (so /foo. does not gobble the period).
// 1. Allow ) for Wikipedia URLs.
View
@@ -7,10 +7,6 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/twitter-text-java.iws" afterPath="$PROJECT_DIR$/twitter-text-java.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test-data/twitter-text-conformance" afterPath="$PROJECT_DIR$/test-data/twitter-text-conformance" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/com/twitter/RegexTest.java" afterPath="$PROJECT_DIR$/tests/com/twitter/RegexTest.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/twitter/Extractor.java" afterPath="$PROJECT_DIR$/src/com/twitter/Extractor.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/twitter/Regex.java" afterPath="$PROJECT_DIR$/src/com/twitter/Regex.java" />
</list>
<ignored path=".idea/workspace.xml" />
<ignored path="twitter-text-java.iws" />
@@ -117,7 +113,7 @@
<file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="45" selection-start="420" selection-end="429" vertical-scroll-proportion="0.26086956">
+ <state line="21" column="13" selection-start="800" selection-end="800" vertical-scroll-proportion="0.11594203">
<folding />
</state>
</provider>
@@ -168,64 +164,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="twitter-text-java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Twitter-text-java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="twitter-text-java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="twitter-text-java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Twitter-text-java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="twitter-text-java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="tests" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="twitter" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="twitter-text-java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="Twitter-text-java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="twitter-text-java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="twitter" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -247,13 +185,13 @@
</component>
<component name="PropertiesComponent">
<property name="project.structure.proportion" value="0.0" />
- <property name="MemberChooser.copyJavadoc" value="false" />
<property name="project.structure.last.edited" value="Modules" />
+ <property name="MemberChooser.copyJavadoc" value="false" />
<property name="GoToClass.includeLibraries" value="false" />
- <property name="MemberChooser.showClasses" value="true" />
<property name="dynamic.classpath" value="false" />
- <property name="MemberChooser.sorted" value="false" />
+ <property name="MemberChooser.showClasses" value="true" />
<property name="project.structure.side.proportion" value="0.0" />
+ <property name="MemberChooser.sorted" value="false" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
</component>
@@ -359,22 +297,6 @@
<module name="" />
<envs />
</configuration>
- <configuration default="true" type="TestUnitRunConfigurationType" factoryName="Ruby test">
- <module name="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
- <envs />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_CLASS_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
- <RTEST_RUN_CONFIG_SETTINGS_ID NAME="INHERITANCE_CHECK_DISABLED" VALUE="false" />
- </configuration>
<configuration default="true" type="RSpecRunConfigurationType" factoryName="RSpec">
<module name="" />
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" />
@@ -393,6 +315,22 @@
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUN_SPECS_SEPARATELY" VALUE="false" />
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" />
</configuration>
+ <configuration default="true" type="TestUnitRunConfigurationType" factoryName="Ruby test">
+ <module name="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e STDOUT.sync=true;STDERR.sync=true;load($0=ARGV.shift)" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
+ <envs />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_CLASS_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
+ <RTEST_RUN_CONFIG_SETTINGS_ID NAME="INHERITANCE_CHECK_DISABLED" VALUE="false" />
+ </configuration>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="JUnit.All in Twitter-text-java" />
</list>
@@ -442,14 +380,14 @@
</component>
<component name="ToolWindowManager">
<frame x="23" y="22" width="1236" height="716" extended-state="0" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
<window_info id="Profile CPU" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21903959" sideWeight="0.659164" order="0" side_tool="false" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21903959" sideWeight="0.659164" order="0" side_tool="false" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997773" sideWeight="0.5" order="5" side_tool="false" />
@@ -505,51 +443,51 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/twitter/Autolink.java">
+ <entry file="file://$PROJECT_DIR$/src/com/twitter/Regex.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="174" column="5" selection-start="7425" selection-end="7425" vertical-scroll-proportion="0.0">
+ <state line="37" column="45" selection-start="2093" selection-end="2093" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tests/com/twitter/AutolinkTest.java">
+ <entry file="file://$PROJECT_DIR$/src/com/twitter/Extractor.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="0" selection-start="548" selection-end="548" vertical-scroll-proportion="0.0">
+ <state line="24" column="23" selection-start="597" selection-end="597" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tests/com/twitter/ConformanceTest.java">
+ <entry file="file://$PROJECT_DIR$/tests/com/twitter/RegexTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="58" selection-start="341" selection-end="356" vertical-scroll-proportion="0.0">
+ <state line="23" column="24" selection-start="696" selection-end="696" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/twitter/Regex.java">
+ <entry file="file://$PROJECT_DIR$/src/com/twitter/Autolink.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="37" column="45" selection-start="2093" selection-end="2093" vertical-scroll-proportion="0.0">
+ <state line="174" column="5" selection-start="7425" selection-end="7425" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/com/twitter/Extractor.java">
+ <entry file="file://$PROJECT_DIR$/tests/com/twitter/ConformanceTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="24" column="23" selection-start="597" selection-end="597" vertical-scroll-proportion="0.0">
+ <state line="14" column="58" selection-start="341" selection-end="356" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tests/com/twitter/RegexTest.java">
+ <entry file="file://$PROJECT_DIR$/tests/com/twitter/AutolinkTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="24" selection-start="696" selection-end="696" vertical-scroll-proportion="0.0">
+ <state line="19" column="0" selection-start="548" selection-end="548" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="45" selection-start="420" selection-end="429" vertical-scroll-proportion="0.26086956">
+ <state line="21" column="13" selection-start="800" selection-end="800" vertical-scroll-proportion="0.11594203">
<folding />
</state>
</provider>

0 comments on commit 7dca394

Please sign in to comment.