jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #484 from ueokande/search-colon

Browse source 
Fix search keywords with colon
This commit is contained in:
Shin'ya Ueoka 2018-10-08 12:46:26 +09:00 • committed by GitHub
commit b09a4d1bae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/shared/urls.js
View file

@ -3,10 +3,17 @@ const trimStart = (str) => {
return str.replace(/^\s+/, '');
};
const SUPPORTED_PROTOCOLS = ['http:', 'https:', 'ftp:', 'mailto:'];
const normalizeUrl = (keywords, searchSettings) => {
try {
return new URL(keywords).href;
let u = new URL(keywords);
if (SUPPORTED_PROTOCOLS.includes(u.protocol.toLowerCase())) {
return u.href;
}
} catch (e) {
// fallthrough
}
if (keywords.includes('.') && !keywords.includes(' ')) {
return 'http://' + keywords;
}
@ -19,7 +26,6 @@ const normalizeUrl = (keywords, searchSettings) => {
query = trimStart(trimStart(keywords).slice(first.length));
}
return template.replace('{}', encodeURIComponent(query));
}
};
export { normalizeUrl };

9
test/shared/urls.test.js
View file

@ -11,6 +11,8 @@ describe("shared/commands/parsers", () => {
};
it('convertes search url', () => {
expect(parsers.normalizeUrl('google.com', config))
.to.equal('http://google.com');
expect(parsers.normalizeUrl('google apple', config))
.to.equal('https://google.com/search?q=apple');
expect(parsers.normalizeUrl('yahoo apple', config))
@ -25,6 +27,13 @@ describe("shared/commands/parsers", () => {
expect(parsers.normalizeUrl('apple banana', config))
.to.equal('https://google.com/search?q=apple%20banana');
});
it('searches with a word containing a colon', () => {
expect(parsers.normalizeUrl('foo:', config))
.to.equal('https://google.com/search?q=foo%3A');
expect(parsers.normalizeUrl('std::vector', config))
.to.equal('https://google.com/search?q=std%3A%3Avector');
});
});
});