Diff
checker
Text
Text
Images
Documents
Excel
Folders
Legal
Enterprise
Desktop
Pricing
Sign in
Download Diffchecker Desktop
Compare text
Find the difference between two text files
Tools
History
Real-time editor
Hide unchanged lines
Disable line wrap
Layout
Split
Unified
Diff precision
Smart
Word
Char
Syntax highlighting
Choose syntax
Ignore
Transform text
Go to first change
Edit input
Diffchecker Desktop
The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!
Get Desktop
Untitled diff
Created
9 years ago
Diff never expires
Clear
Export
Share
Explain
1 removal
Lines
Total
Removed
Characters
Total
Removed
To continue using this feature, upgrade to
Diff
checker
Pro
View Pricing
158 lines
Copy
1 addition
Lines
Total
Added
Characters
Total
Added
To continue using this feature, upgrade to
Diff
checker
Pro
View Pricing
158 lines
Copy
'use babel';
'use babel';
import path from 'path';
import path from 'path';
import fs from 'fs';
import fs from 'fs';
import url from 'url';
import url from 'url';
import { BufferedProcess, CompositeDisposable } from 'atom';
import { BufferedProcess, CompositeDisposable } from 'atom';
import { remote } from 'electron';
import { remote } from 'electron';
import JSON5 from 'json5';
import JSON5 from 'json5';
const packagePath = atom.packages.resolvePackagePath('atom-live-server');
const packagePath = atom.packages.resolvePackagePath('atom-live-server');
const liveServer = path.join(packagePath, '/node_modules/live-server/live-server.js');
const liveServer = path.join(packagePath, '/node_modules/live-server/live-server.js');
Copy
Copied
Copy
Copied
const node = path.resolve(process.env.NODE_PATH, '
../../app/apm
/bin/node');
const node = path.resolve(process.env.NODE_PATH, '
/usr
/bin/node');
let serverProcess;
let serverProcess;
let disposeMenu;
let disposeMenu;
let noBrowser;
let noBrowser;
function addStartMenu() {
function addStartMenu() {
disposeMenu = atom.menu.add(
disposeMenu = atom.menu.add(
[{
[{
label: 'Packages',
label: 'Packages',
submenu : [{
submenu : [{
label: 'atom-live-server',
label: 'atom-live-server',
submenu : [{
submenu : [{
label: 'Start server',
label: 'Start server',
command: `atom-live-server:startServer`
command: `atom-live-server:startServer`
}]
}]
}]
}]
}]
}]
);
);
}
}
export default {
export default {
subscriptions: null,
subscriptions: null,
activate(state) {
activate(state) {
this.subscriptions = new CompositeDisposable();
this.subscriptions = new CompositeDisposable();
this.subscriptions.add(atom.commands.add('atom-workspace', {
this.subscriptions.add(atom.commands.add('atom-workspace', {
'atom-live-server:start-3000': () => this.startServer(3000),
'atom-live-server:start-3000': () => this.startServer(3000),
'atom-live-server:start-4000': () => this.startServer(4000),
'atom-live-server:start-4000': () => this.startServer(4000),
'atom-live-server:start-5000': () => this.startServer(5000),
'atom-live-server:start-5000': () => this.startServer(5000),
'atom-live-server:start-8000': () => this.startServer(8000),
'atom-live-server:start-8000': () => this.startServer(8000),
'atom-live-server:start-9000': () => this.startServer(9000),
'atom-live-server:start-9000': () => this.startServer(9000),
'atom-live-server:startServer': () => this.startServer(),
'atom-live-server:startServer': () => this.startServer(),
'atom-live-server:stopServer': () => this.stopServer()
'atom-live-server:stopServer': () => this.stopServer()
}));
}));
addStartMenu();
addStartMenu();
},
},
deactivate() {
deactivate() {
this.stopServer();
this.stopServer();
this.subscriptions.dispose();
this.subscriptions.dispose();
},
},
startServer(port = 3000) {
startServer(port = 3000) {
if (serverProcess) {
if (serverProcess) {
return;
return;
}
}
const targetPath = atom.project.getPaths()[0];
const targetPath = atom.project.getPaths()[0];
if (!targetPath) {
if (!targetPath) {
atom.notifications.addWarning('[Live Server] You haven\'t opened a Project, you must open one.')
atom.notifications.addWarning('[Live Server] You haven\'t opened a Project, you must open one.')
return;
return;
}
}
noBrowser = false;
noBrowser = false;
const args = [];
const args = [];
const stdout = output => {
const stdout = output => {
if (output.indexOf('Serving ') === 0) {
if (output.indexOf('Serving ') === 0) {
const serverUrl = output.split(' at ')[1];
const serverUrl = output.split(' at ')[1];
const port = url.parse(serverUrl).port;
const port = url.parse(serverUrl).port;
const disposeStartMenu = disposeMenu;
const disposeStartMenu = disposeMenu;
disposeMenu = atom.menu.add(
disposeMenu = atom.menu.add(
[{
[{
label: 'Packages',
label: 'Packages',
submenu : [{
submenu : [{
label: 'atom-live-server',
label: 'atom-live-server',
submenu : [{
submenu : [{
label: output.replace('Serving ', 'Stop '),
label: output.replace('Serving ', 'Stop '),
command: `atom-live-server:stopServer`
command: `atom-live-server:stopServer`
}]
}]
}]
}]
}]
}]
);
);
disposeStartMenu.dispose();
disposeStartMenu.dispose();
if (noBrowser) {
if (noBrowser) {
atom.notifications.addSuccess(`[Live Server] Live server started at ${serverUrl}.`);
atom.notifications.addSuccess(`[Live Server] Live server started at ${serverUrl}.`);
}
}
}
}
console.log(`[Live Server] ${output}`);
console.log(`[Live Server] ${output}`);
};
};
const exit = code => {
const exit = code => {
console.info(`[Live Server] Exited with code ${code}`);
console.info(`[Live Server] Exited with code ${code}`);
this.stopServer();
this.stopServer();
}
}
fs.open(path.join(targetPath, '.atom-live-server.json'), 'r', (err, fd) => {
fs.open(path.join(targetPath, '.atom-live-server.json'), 'r', (err, fd) => {
if (!err) {
if (!err) {
const userConfig = JSON5.parse(fs.readFileSync(fd, 'utf8'));
const userConfig = JSON5.parse(fs.readFileSync(fd, 'utf8'));
Object.keys(userConfig).forEach(key => {
Object.keys(userConfig).forEach(key => {
if (key === 'no-browser') {
if (key === 'no-browser') {
if (userConfig[key] === true) {
if (userConfig[key] === true) {
args.push(`--${key}`);
args.push(`--${key}`);
noBrowser = true;
noBrowser = true;
}
}
}
}
else if (key === 'root') {
else if (key === 'root') {
args.unshift(`${userConfig[key]}`)
args.unshift(`${userConfig[key]}`)
}
}
else {
else {
args.push(`--${key}=${userConfig[key]}`);
args.push(`--${key}=${userConfig[key]}`);
}
}
});
});
}
}
if (!args.length) {
if (!args.length) {
args.push(`--port=${port}`);
args.push(`--port=${port}`);
}
}
args.unshift(liveServer);
args.unshift(liveServer);
serverProcess = new BufferedProcess({
serverProcess = new BufferedProcess({
command: node,
command: node,
args,
args,
stdout,
stdout,
exit,
exit,
options: {
options: {
cwd: targetPath,
cwd: targetPath,
}
}
});
});
console.info(`[Live Server] live-server ${args.join(' ')}`);
console.info(`[Live Server] live-server ${args.join(' ')}`);
});
});
},
},
stopServer() {
stopServer() {
try {
try {
serverProcess.kill();
serverProcess.kill();
} catch (e) {
} catch (e) {
console.error(e);
console.error(e);
}
}
serverProcess = null;
serverProcess = null;
const disposeStopMenu = disposeMenu;
const disposeStopMenu = disposeMenu;
addStartMenu();
addStartMenu();
disposeStopMenu && disposeStopMenu.dispose();
disposeStopMenu && disposeStopMenu.dispose();
atom.notifications.addSuccess('[Live Server] Live server is stopped.');
atom.notifications.addSuccess('[Live Server] Live server is stopped.');
}
}
};
};
Saved diffs
Original text
Open file
'use babel'; import path from 'path'; import fs from 'fs'; import url from 'url'; import { BufferedProcess, CompositeDisposable } from 'atom'; import { remote } from 'electron'; import JSON5 from 'json5'; const packagePath = atom.packages.resolvePackagePath('atom-live-server'); const liveServer = path.join(packagePath, '/node_modules/live-server/live-server.js'); const node = path.resolve(process.env.NODE_PATH, '../../app/apm/bin/node'); let serverProcess; let disposeMenu; let noBrowser; function addStartMenu() { disposeMenu = atom.menu.add( [{ label: 'Packages', submenu : [{ label: 'atom-live-server', submenu : [{ label: 'Start server', command: `atom-live-server:startServer` }] }] }] ); } export default { subscriptions: null, activate(state) { this.subscriptions = new CompositeDisposable(); this.subscriptions.add(atom.commands.add('atom-workspace', { 'atom-live-server:start-3000': () => this.startServer(3000), 'atom-live-server:start-4000': () => this.startServer(4000), 'atom-live-server:start-5000': () => this.startServer(5000), 'atom-live-server:start-8000': () => this.startServer(8000), 'atom-live-server:start-9000': () => this.startServer(9000), 'atom-live-server:startServer': () => this.startServer(), 'atom-live-server:stopServer': () => this.stopServer() })); addStartMenu(); }, deactivate() { this.stopServer(); this.subscriptions.dispose(); }, startServer(port = 3000) { if (serverProcess) { return; } const targetPath = atom.project.getPaths()[0]; if (!targetPath) { atom.notifications.addWarning('[Live Server] You haven\'t opened a Project, you must open one.') return; } noBrowser = false; const args = []; const stdout = output => { if (output.indexOf('Serving ') === 0) { const serverUrl = output.split(' at ')[1]; const port = url.parse(serverUrl).port; const disposeStartMenu = disposeMenu; disposeMenu = atom.menu.add( [{ label: 'Packages', submenu : [{ label: 'atom-live-server', submenu : [{ label: output.replace('Serving ', 'Stop '), command: `atom-live-server:stopServer` }] }] }] ); disposeStartMenu.dispose(); if (noBrowser) { atom.notifications.addSuccess(`[Live Server] Live server started at ${serverUrl}.`); } } console.log(`[Live Server] ${output}`); }; const exit = code => { console.info(`[Live Server] Exited with code ${code}`); this.stopServer(); } fs.open(path.join(targetPath, '.atom-live-server.json'), 'r', (err, fd) => { if (!err) { const userConfig = JSON5.parse(fs.readFileSync(fd, 'utf8')); Object.keys(userConfig).forEach(key => { if (key === 'no-browser') { if (userConfig[key] === true) { args.push(`--${key}`); noBrowser = true; } } else if (key === 'root') { args.unshift(`${userConfig[key]}`) } else { args.push(`--${key}=${userConfig[key]}`); } }); } if (!args.length) { args.push(`--port=${port}`); } args.unshift(liveServer); serverProcess = new BufferedProcess({ command: node, args, stdout, exit, options: { cwd: targetPath, } }); console.info(`[Live Server] live-server ${args.join(' ')}`); }); }, stopServer() { try { serverProcess.kill(); } catch (e) { console.error(e); } serverProcess = null; const disposeStopMenu = disposeMenu; addStartMenu(); disposeStopMenu && disposeStopMenu.dispose(); atom.notifications.addSuccess('[Live Server] Live server is stopped.'); } };
Changed text
Open file
'use babel'; import path from 'path'; import fs from 'fs'; import url from 'url'; import { BufferedProcess, CompositeDisposable } from 'atom'; import { remote } from 'electron'; import JSON5 from 'json5'; const packagePath = atom.packages.resolvePackagePath('atom-live-server'); const liveServer = path.join(packagePath, '/node_modules/live-server/live-server.js'); const node = path.resolve(process.env.NODE_PATH, '/usr/bin/node'); let serverProcess; let disposeMenu; let noBrowser; function addStartMenu() { disposeMenu = atom.menu.add( [{ label: 'Packages', submenu : [{ label: 'atom-live-server', submenu : [{ label: 'Start server', command: `atom-live-server:startServer` }] }] }] ); } export default { subscriptions: null, activate(state) { this.subscriptions = new CompositeDisposable(); this.subscriptions.add(atom.commands.add('atom-workspace', { 'atom-live-server:start-3000': () => this.startServer(3000), 'atom-live-server:start-4000': () => this.startServer(4000), 'atom-live-server:start-5000': () => this.startServer(5000), 'atom-live-server:start-8000': () => this.startServer(8000), 'atom-live-server:start-9000': () => this.startServer(9000), 'atom-live-server:startServer': () => this.startServer(), 'atom-live-server:stopServer': () => this.stopServer() })); addStartMenu(); }, deactivate() { this.stopServer(); this.subscriptions.dispose(); }, startServer(port = 3000) { if (serverProcess) { return; } const targetPath = atom.project.getPaths()[0]; if (!targetPath) { atom.notifications.addWarning('[Live Server] You haven\'t opened a Project, you must open one.') return; } noBrowser = false; const args = []; const stdout = output => { if (output.indexOf('Serving ') === 0) { const serverUrl = output.split(' at ')[1]; const port = url.parse(serverUrl).port; const disposeStartMenu = disposeMenu; disposeMenu = atom.menu.add( [{ label: 'Packages', submenu : [{ label: 'atom-live-server', submenu : [{ label: output.replace('Serving ', 'Stop '), command: `atom-live-server:stopServer` }] }] }] ); disposeStartMenu.dispose(); if (noBrowser) { atom.notifications.addSuccess(`[Live Server] Live server started at ${serverUrl}.`); } } console.log(`[Live Server] ${output}`); }; const exit = code => { console.info(`[Live Server] Exited with code ${code}`); this.stopServer(); } fs.open(path.join(targetPath, '.atom-live-server.json'), 'r', (err, fd) => { if (!err) { const userConfig = JSON5.parse(fs.readFileSync(fd, 'utf8')); Object.keys(userConfig).forEach(key => { if (key === 'no-browser') { if (userConfig[key] === true) { args.push(`--${key}`); noBrowser = true; } } else if (key === 'root') { args.unshift(`${userConfig[key]}`) } else { args.push(`--${key}=${userConfig[key]}`); } }); } if (!args.length) { args.push(`--port=${port}`); } args.unshift(liveServer); serverProcess = new BufferedProcess({ command: node, args, stdout, exit, options: { cwd: targetPath, } }); console.info(`[Live Server] live-server ${args.join(' ')}`); }); }, stopServer() { try { serverProcess.kill(); } catch (e) { console.error(e); } serverProcess = null; const disposeStopMenu = disposeMenu; addStartMenu(); disposeStopMenu && disposeStopMenu.dispose(); atom.notifications.addSuccess('[Live Server] Live server is stopped.'); } };
Find difference