Debugged broken newline in customText - Issue#1780 (#1798) by pran01

* Added a delimiter switch

* Added delimiter to wordfilter

* Delimiter Switch to Delimiter Checkbox

* fixed random input fields styling

* regenerated lockfile to version 2

* brought back example.evn

* removed console logs

* removed garbage code

* reverted back delimiter tagline

* solved newline bug in custom

* removed garbage code

Co-authored-by: Jack <bartnikjack@gmail.com>
This commit is contained in:
Pranav Sinha 2021-09-01 20:45:44 +05:30 committed by GitHub
parent 6816a22be6
commit 55b8d226c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 30 deletions

41
package-lock.json generated
View file

@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
"name": "monkeytype",
"version": "1.5.6",
"license": "GPL-3.0",
"dependencies": {
@ -7747,22 +7748,22 @@
"node": ">=7.0.0"
}
},
"node_modules/gulp-sass/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/gulp-sass/node_modules/supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"dependencies": {
"camelcase-keys": "^2.0.0",
"decamelize": "^1.1.2",
"loud-rejection": "^1.0.0",
"map-obj": "^1.0.1",
"minimist": "^1.1.3",
"normalize-package-data": "^2.3.4",
"object-assign": "^4.0.1",
"read-pkg-up": "^1.0.1",
"redent": "^1.0.0",
"trim-newlines": "^3.7.0"
"has-flag": "^4.0.0"
},
"engines": {
"node": ">=8"
@ -10327,6 +10328,9 @@
},
"bin": {
"nopt": "bin/nopt.js"
},
"engines": {
"node": "*"
}
},
"node_modules/normalize-package-data": {
@ -20571,22 +20575,19 @@
"color-name": "~1.1.4"
}
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"requires": {
"camelcase-keys": "^2.0.0",
"decamelize": "^1.1.2",
"loud-rejection": "^1.0.0",
"map-obj": "^1.0.1",
"minimist": "^1.1.3",
"normalize-package-data": "^2.3.4",
"object-assign": "^4.0.1",
"read-pkg-up": "^1.0.1",
"redent": "^1.0.0",
"trim-newlines": "^3.7.0"
"has-flag": "^4.0.0"
}
}
}

View file

@ -621,14 +621,7 @@ export async function init() {
if (/\t/g.test(randomWord)) {
setHasTab(true);
}
randomWord = randomWord.trim();
randomWord = randomWord.replace(/\\\\t/g, "\t");
randomWord = randomWord.replace(/\\\\n/g, "\n");
randomWord = randomWord.replace(/\\t/g, "\t");
randomWord = randomWord.replace(/\\n/g, "\n");
randomWord = randomWord.replace(/ +/g, " ");
randomWord = randomWord.replace(/( *(\r\n|\r|\n) *)/g, "\n ");
randomWord = randomWord.replace(/[\u2060]/g, " ");
if (/ +/.test(randomWord)) {
let randomList = randomWord.split(" ");
let id = 0;
@ -636,9 +629,22 @@ export async function init() {
words.push(randomList[id]);
id++;
if (words.length == wordsBound) break;
if (
words.length == wordsBound &&
Config.mode == "custom" &&
CustomText.isWordRandom
) {
break;
}
}
if (
Config.mode == "custom" &&
!CustomText.isWordRandom &&
!CustomText.isTimeRandom
) {
} else {
i = words.length - 1;
}
i = words.length - 1;
} else {
words.push(randomWord);
}