#2 改正正则表达

program-in-chinese · Oct 19, 2018 · 77890f1 · 77890f1
1 parent 3e0c990
commit 77890f1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/test/释义处理测试.js b/test/释义处理测试.js
@@ -1,3 +1,7 @@
+/*
+在Chrome下运行, 不知为何在火狐中报错: invalid regexp group
+*/
+
 QUnit.test("分词性", function (assert) {
   assert.deepEqual(
     分词性("n. 种类, 方式\\nvt. 分类", 词性),
@@ -70,10 +74,16 @@ QUnit.test("拆分骆驼命名_多个单词", function (assert) {
     "");
 });
 
-// TODO: 修复
-/*QUnit.test("拆分骆驼命名_全大写单词", function (assert) {
+QUnit.test("拆分骆驼命名_全大写单词", function (assert) {
   assert.deepEqual(
     拆分骆驼命名("READING"),
     ["READING"],
     "");
-});*/
+});
+
+QUnit.test("拆分骆驼命名_部分连续大写单词", function (assert) {
+  assert.deepEqual(
+    拆分骆驼命名("HTMLElement"),
+    ["HTML", "Element"],
+    "");
+});
diff --git a/功用/文本处理.js b/功用/文本处理.js
@@ -28,5 +28,6 @@ function 取字段中最长句(字段) {
 }
 
 function 拆分骆驼命名(命名) {
-  return 命名.split(/(?=[A-Z])/);
+  // 参考: https://stackoverflow.com/a/7599674/1536803
+  return 命名.split(/(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])/);
 }