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

Commit 402ffab

Browse files
committed
Removed non-inclusive language
Changed to more fitting replacement
1 parent ca877bb commit 402ffab

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

src/LiveDevelopment/Inspector/Inspector.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3244,7 +3244,7 @@
32443244
{ "name": "script", "optional": true, "type": "string", "description": "Regular expression defining the scripts to ignore while stepping." }
32453245
],
32463246
"hidden": true,
3247-
"description": "Makes backend skip steps in the sources with names matching given pattern. VM will try leave blacklisted scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful."
3247+
"description": "Makes backend skip steps in the sources with names matching given pattern. VM will try leave blocklisted scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful."
32483248
}
32493249
],
32503250
"events": [

src/LiveDevelopment/Inspector/inspector.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ <h3><a href="#Debugger">Debugger</a></h3>
386386
<li><a href='#Debugger.setVariableValue'>Debugger.setVariableValue</a>: Changes value of variable in a callframe or a closure. Either callframe or function must be specified. Object-based scopes are not supported and must be mutated manually.</li>
387387
<li><a href='#Debugger.getStepInPositions'>Debugger.getStepInPositions</a>: Lists all positions where step-in is possible for a current statement in a specified call frame</li>
388388
<li><a href='#Debugger.getBacktrace'>Debugger.getBacktrace</a>: Returns call stack including variables changed since VM was paused. VM must be paused.</li>
389-
<li><a href='#Debugger.skipStackFrames'>Debugger.skipStackFrames</a>: Makes backend skip steps in the sources with names matching given pattern. VM will try leave blacklisted scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful.</li>
389+
<li><a href='#Debugger.skipStackFrames'>Debugger.skipStackFrames</a>: Makes backend skip steps in the sources with names matching given pattern. VM will try leave blocklisted scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful.</li>
390390
</ul>
391391
<span class='label label-info'>Event</span>
392392
<ul>
@@ -3883,7 +3883,7 @@ <h1>Debugger</h1>
38833883
<li><a href='#Debugger.setVariableValue'>Debugger.setVariableValue</a>: Changes value of variable in a callframe or a closure. Either callframe or function must be specified. Object-based scopes are not supported and must be mutated manually.</li>
38843884
<li><a href='#Debugger.getStepInPositions'>Debugger.getStepInPositions</a>: Lists all positions where step-in is possible for a current statement in a specified call frame</li>
38853885
<li><a href='#Debugger.getBacktrace'>Debugger.getBacktrace</a>: Returns call stack including variables changed since VM was paused. VM must be paused.</li>
3886-
<li><a href='#Debugger.skipStackFrames'>Debugger.skipStackFrames</a>: Makes backend skip steps in the sources with names matching given pattern. VM will try leave blacklisted scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful.</li>
3886+
<li><a href='#Debugger.skipStackFrames'>Debugger.skipStackFrames</a>: Makes backend skip steps in the sources with names matching given pattern. VM will try leave blocklisted scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful.</li>
38873887
</ul>
38883888
<span class='label label-info'>Event</span>
38893889
<ul>
@@ -4453,7 +4453,7 @@ <h4>Code Example:</h4>
44534453
</div>
44544454
<div id='Debugger_skipStackFrames' class='command'>
44554455
<h3>Debugger.skipStackFrames <span class='label label-success'>Command</span></h3>
4456-
<p>Makes backend skip steps in the sources with names matching given pattern. VM will try leave blacklisted scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful.</p>
4456+
<p>Makes backend skip steps in the sources with names matching given pattern. VM will try leave blocklisted scripts by performing 'step in' several times, finally resorting to 'step out' if unsuccessful.</p>
44574457
<dl>
44584458
<dt>script (optional)</dt>
44594459
<dd>String <span class='text'>Regular expression defining the scripts to ignore while stepping.</span></dd>

src/editor/Editor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* destroy() an Editor that's going away so it can release its Document ref.
3030
*
3131
* For now, there's a distinction between the "master" Editor for a Document - which secretly acts
32-
* as the Document's internal model of the text state - and the multitude of "slave" secondary Editors
32+
* as the Document's internal model of the text state - and the multitude of "subordinate" secondary Editors
3333
* which, via Document, sync their changes to and from that master.
3434
*
3535
* For now, direct access to the underlying CodeMirror object is still possible via `_codeMirror` --
@@ -313,7 +313,7 @@ define(function (require, exports, module) {
313313
*
314314
* @param {!Document} document
315315
* @param {!boolean} makeMasterEditor If true, this Editor will set itself as the (secret) "master"
316-
* Editor for the Document. If false, this Editor will attach to the Document as a "slave"/
316+
* Editor for the Document. If false, this Editor will attach to the Document as a "subordinate"/
317317
* secondary editor.
318318
* @param {!jQueryObject|DomNode} container Container to add the editor to.
319319
* @param {{startLine: number, endLine: number}=} range If specified, range of lines within the document

src/editor/EditorManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ define(function (require, exports, module) {
175175
* @private
176176
* @param {!Document} doc Document for the Editor's content
177177
* @param {!boolean} makeMasterEditor If true, the Editor will set itself as the private "master"
178-
* Editor for the Document. If false, the Editor will attach to the Document as a "slave."
178+
* Editor for the Document. If false, the Editor will attach to the Document as a "subordinate."
179179
* @param {!jQueryObject} container Container to add the editor to.
180180
* @param {{startLine: number, endLine: number}=} range If specified, range of lines within the document
181181
* to display in this editor. Inclusive.

src/extensions/default/PrefsCodeHints/main.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ define(function (require, exports, module) {
5858
};
5959

6060
// List of parent keys for which no key hints will be provided.
61-
var parentKeyBlacklist = [
61+
var parentKeyBlocklist = [
6262
"language.fileExtensions",
6363
"language.fileNames",
6464
"path"
@@ -197,9 +197,9 @@ define(function (require, exports, module) {
197197
this.ctxInfo = JSONUtils.getContextInfo(this.editor, this.editor.getCursorPos(), true);
198198

199199
if (this.ctxInfo && this.ctxInfo.tokenType) {
200-
// Disallow hints for blacklisted keys.
200+
// Disallow hints for blocklisted keys.
201201
if (this.ctxInfo.tokenType === JSONUtils.TOKEN_KEY &&
202-
parentKeyBlacklist.indexOf(this.ctxInfo.parentKeyName) !== -1) {
202+
parentKeyBlocklist.indexOf(this.ctxInfo.parentKeyName) !== -1) {
203203
return false;
204204
}
205205
return true;

src/extensions/default/PrefsCodeHints/unittests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ define(function (require, exports, module) {
247247
verifyHints(hintList, "spaceUnits");
248248
});
249249

250-
it("should NOT hint for blacklisted parent keys", function () {
250+
it("should NOT hint for blocklisted parent keys", function () {
251251
// Between " and txt"
252252
testEditor.setCursorPos({line: 4, ch: 9});
253253
expectNoHints(PrefsCodeHints.hintProvider);

src/language/JSONUtils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ define(function (require, exports, module) {
3030
var TOKEN_KEY = 1,
3131
TOKEN_VALUE = 2;
3232

33-
// Whitelist for allowed value types.
33+
// Allow-list for allowed value types.
3434
var valueTokenTypes = ["atom", "string", "number", "variable"];
3535

3636
// Reg-ex to match colon, comma, opening bracket of an array and white-space.

test/perf/OpenFile-perf-files/brackets-concat.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10839,7 +10839,7 @@ define('document/TextRange',['require','exports','module'],function (require, ex
1083910839
* destroy() an Editor that's going away so it can release its Document ref.
1084010840
*
1084110841
* For now, there's a distinction between the "master" Editor for a Document - which secretly acts
10842-
* as the Document's internal model of the text state - and the multitude of "slave" secondary Editors
10842+
* as the Document's internal model of the text state - and the multitude of "subordinate" secondary Editors
1084310843
* which, via Document, sync their changes to and from that master.
1084410844
*
1084510845
* For now, direct access to the underlying CodeMirror object is still possible via _codeMirror --
@@ -11056,7 +11056,7 @@ define('editor/Editor',['require','exports','module','editor/EditorManager','edi
1105611056
*
1105711057
* @param {!Document} document
1105811058
* @param {!boolean} makeMasterEditor If true, this Editor will set itself as the (secret) "master"
11059-
* Editor for the Document. If false, this Editor will attach to the Document as a "slave"/
11059+
* Editor for the Document. If false, this Editor will attach to the Document as a "subordinate"/
1106011060
* secondary editor.
1106111061
* @param {!string} mode Syntax-highlighting language mode; "" means plain-text mode.
1106211062
* See {@link EditorUtils#getModeFromFileExtension()}.
@@ -16178,7 +16178,7 @@ define('editor/EditorManager',['require','exports','module','file/FileUtils','co
1617816178
* file extension. The editor is appended to the given container as a visible child.
1617916179
* @param {!Document} doc Document for the Editor's content
1618016180
* @param {!boolean} makeMasterEditor If true, the Editor will set itself as the private "master"
16181-
* Editor for the Document. If false, the Editor will attach to the Document as a "slave."
16181+
* Editor for the Document. If false, the Editor will attach to the Document as a "subordinate."
1618216182
* @param {!jQueryObject} container Container to add the editor to.
1618316183
* @param {{startLine: number, endLine: number}=} range If specified, range of lines within the document
1618416184
* to display in this editor. Inclusive.
@@ -49093,7 +49093,7 @@ define('document/TextRange',['require','exports','module'],function (require, ex
4909349093
* destroy() an Editor that's going away so it can release its Document ref.
4909449094
*
4909549095
* For now, there's a distinction between the "master" Editor for a Document - which secretly acts
49096-
* as the Document's internal model of the text state - and the multitude of "slave" secondary Editors
49096+
* as the Document's internal model of the text state - and the multitude of "subordinate" secondary Editors
4909749097
* which, via Document, sync their changes to and from that master.
4909849098
*
4909949099
* For now, direct access to the underlying CodeMirror object is still possible via _codeMirror --
@@ -49310,7 +49310,7 @@ define('editor/Editor',['require','exports','module','editor/EditorManager','edi
4931049310
*
4931149311
* @param {!Document} document
4931249312
* @param {!boolean} makeMasterEditor If true, this Editor will set itself as the (secret) "master"
49313-
* Editor for the Document. If false, this Editor will attach to the Document as a "slave"/
49313+
* Editor for the Document. If false, this Editor will attach to the Document as a "subordinate"/
4931449314
* secondary editor.
4931549315
* @param {!string} mode Syntax-highlighting language mode; "" means plain-text mode.
4931649316
* See {@link EditorUtils#getModeFromFileExtension()}.
@@ -54432,7 +54432,7 @@ define('editor/EditorManager',['require','exports','module','file/FileUtils','co
5443254432
* file extension. The editor is appended to the given container as a visible child.
5443354433
* @param {!Document} doc Document for the Editor's content
5443454434
* @param {!boolean} makeMasterEditor If true, the Editor will set itself as the private "master"
54435-
* Editor for the Document. If false, the Editor will attach to the Document as a "slave."
54435+
* Editor for the Document. If false, the Editor will attach to the Document as a "subordinate."
5443654436
* @param {!jQueryObject} container Container to add the editor to.
5443754437
* @param {{startLine: number, endLine: number}=} range If specified, range of lines within the document
5443854438
* to display in this editor. Inclusive.

0 commit comments

Comments
 (0)