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

Merge pull request #666 from chen-chao/localhost

Browse source 
support url started with localhost
This commit is contained in:
Shin'ya Ueoka 2019-11-11 03:31:58 +00:00 • committed by GitHub
commit ae77b386f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/shared/urls.ts
View file

@ -7,6 +7,29 @@ const trimStart = (str: string): string => {
const SUPPORTED_PROTOCOLS = ['http:', 'https:', 'ftp:', 'mailto:', 'about:'];
const isLocalhost = (url: string): boolean => {
if (url === 'localhost') {
return true;
}
let [host, port] = url.split(':', 2);
return host === 'localhost' && !isNaN(Number(port));
};
const isMissingHttp = (keywords: string): boolean => {
if (keywords.includes('.') && !keywords.includes(' ')) {
return true;
}
try {
let u = new URL('http://' + keywords);
return isLocalhost(u.host)
} catch (e) {
// fallthrough
}
return false;
};
const searchUrl = (keywords: string, search: Search): string => {
try {
let u = new URL(keywords);
@ -16,9 +39,11 @@ const searchUrl = (keywords: string, search: Search): string => {
} catch (e) {
// fallthrough
}
if (keywords.includes('.') && !keywords.includes(' ')) {
if (isMissingHttp(keywords)) {
return 'http://' + keywords;
}
let template = search.engines[search.defaultEngine];
let query = keywords;

16
test/shared/urls.test.ts
View file

@ -36,6 +36,21 @@ describe("shared/commands/parsers", () => {
expect(parsers.searchUrl('std::vector', config))
.to.equal('https://google.com/search?q=std%3A%3Avector');
});
it('localhost urls', () => {
expect(parsers.searchUrl('localhost', config))
.to.equal('http://localhost');
expect(parsers.searchUrl('http://localhost', config))
.to.equal('http://localhost/');
expect(parsers.searchUrl('localhost:8080', config))
.to.equal('http://localhost:8080');
expect(parsers.searchUrl('localhost:80nan', config))
.to.equal('https://google.com/search?q=localhost%3A80nan');
expect(parsers.searchUrl('localhost 8080', config))
.to.equal('https://google.com/search?q=localhost%208080');
expect(parsers.searchUrl('localhost:80/build', config))
.to.equal('http://localhost:80/build')
})
});
describe('#normalizeUrl', () => {
@ -47,4 +62,3 @@ describe("shared/commands/parsers", () => {
});
});
});