Skip to content
This repository was archived by the owner on Dec 23, 2021. It is now read-only.

Commit 8e10f8b

Browse files
andreamahandreamah
committed
corrected whitespace diffs again
1 parent 0ec5989 commit 8e10f8b

File tree

4 files changed

+508
-508
lines changed

4 files changed

+508
-508
lines changed

‎gulpfile.js

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -23,122 +23,122 @@ const outDest = "out";
2323
const languages = [{ folderName: "en", id: "en" }];
2424

2525
gulp.task("clean", () => {
26-
return del(
27-
[
28-
"out/*",
29-
"package.nls.*.json",
30-
"../../dist/*0.0.0-UNTRACKEDVERSION.vsix",
31-
],
32-
{ force: true }
33-
);
26+
return del(
27+
[
28+
"out/*",
29+
"package.nls.*.json",
30+
"../../dist/*0.0.0-UNTRACKEDVERSION.vsix",
31+
],
32+
{ force: true }
33+
);
3434
});
3535

3636
const pythonToMove = [
37-
"./src/adafruit_circuitplayground/*.*",
38-
"./src/microbit/*.*",
39-
"./src/microbit/!(test)/**/*",
40-
"./src/clue/*.*",
41-
"./src/clue/!(test)/**/*",
42-
"./src/*.py",
43-
"./src/common/*.py",
44-
"./src/dev-requirements.txt",
45-
"./src/requirements.txt",
46-
"./src/templates/*.*",
47-
"./src/*.sh"
37+
"./src/adafruit_circuitplayground/*.*",
38+
"./src/microbit/*.*",
39+
"./src/microbit/!(test)/**/*",
40+
"./src/clue/*.*",
41+
"./src/clue/!(test)/**/*",
42+
"./src/*.py",
43+
"./src/common/*.py",
44+
"./src/dev-requirements.txt",
45+
"./src/requirements.txt",
46+
"./src/templates/*.*",
47+
"./src/*.sh"
4848
];
4949

5050
gulp.task("python-compile", () => {
51-
// the base option sets the relative root for the set of files,
52-
// preserving the folder structure
53-
return gulp.src(pythonToMove, { base: "./src/" }).pipe(gulp.dest("out"));
51+
// the base option sets the relative root for the set of files,
52+
// preserving the folder structure
53+
return gulp.src(pythonToMove, { base: "./src/" }).pipe(gulp.dest("out"));
5454
});
5555

5656
gulp.task("internal-compile", () => {
57-
return compile(false);
57+
return compile(false);
5858
});
5959

6060
gulp.task("internal-nls-compile", () => {
61-
return compile(true);
61+
return compile(true);
6262
});
6363

6464
gulp.task("add-locales", () => {
65-
return gulp
66-
.src(["package.nls.json"])
67-
.pipe(nls.createAdditionalLanguageFiles(languages, "locales"))
68-
.pipe(gulp.dest("."));
65+
return gulp
66+
.src(["package.nls.json"])
67+
.pipe(nls.createAdditionalLanguageFiles(languages, "locales"))
68+
.pipe(gulp.dest("."));
6969
});
7070

7171
gulp.task("vsce:publish", () => {
72-
return vsce.publish();
72+
return vsce.publish();
7373
});
7474

7575
gulp.task("vsce:package", () => {
76-
return vsce.createVSIX({
77-
packagePath:
78-
"../../dist/deviceSimulatorExpress-0.0.0-UNTRACKEDVERSION.vsix",
79-
});
76+
return vsce.createVSIX({
77+
packagePath:
78+
"../../dist/deviceSimulatorExpress-0.0.0-UNTRACKEDVERSION.vsix",
79+
});
8080
});
8181

8282
gulp.task(
83-
"compile",
84-
gulp.series("clean", "internal-compile", "python-compile", callback => {
85-
callback();
86-
})
83+
"compile",
84+
gulp.series("clean", "internal-compile", "python-compile", callback => {
85+
callback();
86+
})
8787
);
8888

8989
gulp.task(
90-
"build",
91-
gulp.series(
92-
"clean",
93-
"internal-nls-compile",
94-
"python-compile",
95-
"add-locales",
96-
callback => {
97-
callback();
98-
}
99-
)
90+
"build",
91+
gulp.series(
92+
"clean",
93+
"internal-nls-compile",
94+
"python-compile",
95+
"add-locales",
96+
callback => {
97+
callback();
98+
}
99+
)
100100
);
101101

102102
gulp.task(
103-
"publish",
104-
gulp.series("compile", "vsce:publish", callback => {
105-
callback();
106-
})
103+
"publish",
104+
gulp.series("compile", "vsce:publish", callback => {
105+
callback();
106+
})
107107
);
108108

109109
gulp.task(
110-
"package",
111-
gulp.series("compile", "vsce:package", callback => {
112-
callback();
113-
})
110+
"package",
111+
gulp.series("compile", "vsce:package", callback => {
112+
callback();
113+
})
114114
);
115115

116116
//---- internal
117117

118118
function compile(buildNls) {
119-
var r = tsProject
120-
.src()
121-
.pipe(sourcemaps.init())
122-
.pipe(tsProject())
123-
.js.pipe(buildNls ? nls.rewriteLocalizeCalls() : es.through())
124-
.pipe(
125-
buildNls
126-
? nls.createAdditionalLanguageFiles(languages, "locales", "out")
127-
: es.through()
128-
);
129-
130-
if (inlineMap && inlineSource) {
131-
r = r.pipe(sourcemaps.write());
132-
} else {
133-
r = r.pipe(
134-
sourcemaps.write("../out", {
135-
// no inlined source
136-
includeContent: inlineSource,
137-
// Return relative source map root directories per file.
138-
sourceRoot: "../src",
139-
})
140-
);
141-
}
142-
143-
return r.pipe(gulp.dest(outDest));
119+
var r = tsProject
120+
.src()
121+
.pipe(sourcemaps.init())
122+
.pipe(tsProject())
123+
.js.pipe(buildNls ? nls.rewriteLocalizeCalls() : es.through())
124+
.pipe(
125+
buildNls
126+
? nls.createAdditionalLanguageFiles(languages, "locales", "out")
127+
: es.through()
128+
);
129+
130+
if (inlineMap && inlineSource) {
131+
r = r.pipe(sourcemaps.write());
132+
} else {
133+
r = r.pipe(
134+
sourcemaps.write("../out", {
135+
// no inlined source
136+
includeContent: inlineSource,
137+
// Return relative source map root directories per file.
138+
sourceRoot: "../src",
139+
})
140+
);
141+
}
142+
143+
return r.pipe(gulp.dest(outDest));
144144
}

‎locales/en/package.i18n.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
2-
"deviceSimulatorExpressExtension.commands.common.installDependencies": "Install Extension Dependencies",
3-
"deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
4-
"deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
5-
"deviceSimulatorExpressExtension.commands.common.changeBaudRate": "Change Baud Rate",
6-
"deviceSimulatorExpressExtension.commands.common.closeSerialMonitor": "Close Serial Monitor",
7-
"deviceSimulatorExpressExtension.commands.common.openSerialMonitor": "Open Serial Monitor",
8-
"deviceSimulatorExpressExtension.commands.common.selectSerialPort": "Select Serial Port",
9-
"deviceSimulatorExpressExtension.commands.cpx.openSimulator": "[Circuit Playground Express] Open Simulator",
10-
"deviceSimulatorExpressExtension.commands.cpx.newFile": "[Circuit Playground Express] New File",
11-
"deviceSimulatorExpressExtension.commands.cpx.deployToDevice": "[Circuit Playground Express] Deploy to Device",
12-
"deviceSimulatorExpressExtension.commands.microbit.deployToDevice": "[micro:bit] Deploy to Device",
13-
"deviceSimulatorExpressExtension.commands.microbit.openSimulator": "[micro:bit] Open Simulator",
14-
"deviceSimulatorExpressExtension.commands.microbit.newFile": "[micro:bit] New File",
15-
"deviceSimulatorExpressExtension.commands.clue.openSimulator": "[Clue] Open Simulator",
16-
"deviceSimulatorExpressExtension.commands.clue.newFile": "[Clue] New File",
17-
"deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
18-
"deviceSimulatorExpressExtension.configuration.properties.configEnvOnChange": "When you change the Python interpreter, the Device Simulator Express will automatically configure itself for the required dependencies.",
19-
"deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger.",
20-
"deviceSimulatorExpressExtension.configuration.properties.dependencyChecker": "Whether or not to ask if we can download dependencies. If unchecked, the extension will default to never download dependencies, except when automatically creating a virtual environment in the extension files.",
21-
"deviceSimulatorExpressExtension.configuration.properties.previewMode": "Enable this to test out and play with the new micro:bit simulator!"
2+
"deviceSimulatorExpressExtension.commands.common.installDependencies": "Install Extension Dependencies",
3+
"deviceSimulatorExpressExtension.commands.common.label": "Device Simulator Express",
4+
"deviceSimulatorExpressExtension.commands.common.runSimulator": "Run Simulator",
5+
"deviceSimulatorExpressExtension.commands.common.changeBaudRate": "Change Baud Rate",
6+
"deviceSimulatorExpressExtension.commands.common.closeSerialMonitor": "Close Serial Monitor",
7+
"deviceSimulatorExpressExtension.commands.common.openSerialMonitor": "Open Serial Monitor",
8+
"deviceSimulatorExpressExtension.commands.common.selectSerialPort": "Select Serial Port",
9+
"deviceSimulatorExpressExtension.commands.cpx.openSimulator": "[Circuit Playground Express] Open Simulator",
10+
"deviceSimulatorExpressExtension.commands.cpx.newFile": "[Circuit Playground Express] New File",
11+
"deviceSimulatorExpressExtension.commands.cpx.deployToDevice": "[Circuit Playground Express] Deploy to Device",
12+
"deviceSimulatorExpressExtension.commands.microbit.deployToDevice": "[micro:bit] Deploy to Device",
13+
"deviceSimulatorExpressExtension.commands.microbit.openSimulator": "[micro:bit] Open Simulator",
14+
"deviceSimulatorExpressExtension.commands.microbit.newFile": "[micro:bit] New File",
15+
"deviceSimulatorExpressExtension.commands.clue.openSimulator": "[Clue] Open Simulator",
16+
"deviceSimulatorExpressExtension.commands.clue.newFile": "[Clue] New File",
17+
"deviceSimulatorExpressExtension.configuration.title": "Device Simulator Express configuration",
18+
"deviceSimulatorExpressExtension.configuration.properties.configEnvOnChange": "When you change the Python interpreter, the Device Simulator Express will automatically configure itself for the required dependencies.",
19+
"deviceSimulatorExpressExtension.configuration.properties.debuggerPort": "The port the Server will listen on for communication with the debugger.",
20+
"deviceSimulatorExpressExtension.configuration.properties.dependencyChecker": "Whether or not to ask if we can download dependencies. If unchecked, the extension will default to never download dependencies, except when automatically creating a virtual environment in the extension files.",
21+
"deviceSimulatorExpressExtension.configuration.properties.previewMode": "Enable this to test out and play with the new micro:bit simulator!"
2222
}

0 commit comments

Comments
 (0)