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

Commit

Permalink
Removed non-inclusive language
Browse files Browse the repository at this point in the history
Changed to more fitting replacement
  • Loading branch information
alb committed Jul 20, 2020
1 parent ca877bb commit 402ffab
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/LiveDevelopment/Inspector/Inspector.json
Original file line number Diff line number Diff line change
Expand Up @@ -3244,7 +3244,7 @@
{ "name": "script", "optional": true, "type": "string", "description": "Regular expression defining the scripts to ignore while stepping." }
],
"hidden": true,
"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."
"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."
}
],
"events": [
Expand Down
6 changes: 3 additions & 3 deletions src/LiveDevelopment/Inspector/inspector.html
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ <h3><a href="#Debugger">Debugger</a></h3>
<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>
<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>
<li><a href='#Debugger.getBacktrace'>Debugger.getBacktrace</a>: Returns call stack including variables changed since VM was paused. VM must be paused.</li>
<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>
<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>
</ul>
<span class='label label-info'>Event</span>
<ul>
Expand Down Expand Up @@ -3883,7 +3883,7 @@ <h1>Debugger</h1>
<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>
<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>
<li><a href='#Debugger.getBacktrace'>Debugger.getBacktrace</a>: Returns call stack including variables changed since VM was paused. VM must be paused.</li>
<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>
<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>
</ul>
<span class='label label-info'>Event</span>
<ul>
Expand Down Expand Up @@ -4453,7 +4453,7 @@ <h4>Code Example:</h4>
</div>
<div id='Debugger_skipStackFrames' class='command'>
<h3>Debugger.skipStackFrames <span class='label label-success'>Command</span></h3>
<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>
<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>
<dl>
<dt>script (optional)</dt>
<dd>String <span class='text'>Regular expression defining the scripts to ignore while stepping.</span></dd>
Expand Down
4 changes: 2 additions & 2 deletions src/editor/Editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* destroy() an Editor that's going away so it can release its Document ref.
*
* For now, there's a distinction between the "master" Editor for a Document - which secretly acts
* as the Document's internal model of the text state - and the multitude of "slave" secondary Editors
* as the Document's internal model of the text state - and the multitude of "subordinate" secondary Editors
* which, via Document, sync their changes to and from that master.
*
* For now, direct access to the underlying CodeMirror object is still possible via `_codeMirror` --
Expand Down Expand Up @@ -313,7 +313,7 @@ define(function (require, exports, module) {
*
* @param {!Document} document
* @param {!boolean} makeMasterEditor If true, this Editor will set itself as the (secret) "master"
* Editor for the Document. If false, this Editor will attach to the Document as a "slave"/
* Editor for the Document. If false, this Editor will attach to the Document as a "subordinate"/
* secondary editor.
* @param {!jQueryObject|DomNode} container Container to add the editor to.
* @param {{startLine: number, endLine: number}=} range If specified, range of lines within the document
Expand Down
2 changes: 1 addition & 1 deletion src/editor/EditorManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ define(function (require, exports, module) {
* @private
* @param {!Document} doc Document for the Editor's content
* @param {!boolean} makeMasterEditor If true, the Editor will set itself as the private "master"
* Editor for the Document. If false, the Editor will attach to the Document as a "slave."
* Editor for the Document. If false, the Editor will attach to the Document as a "subordinate."
* @param {!jQueryObject} container Container to add the editor to.
* @param {{startLine: number, endLine: number}=} range If specified, range of lines within the document
* to display in this editor. Inclusive.
Expand Down
6 changes: 3 additions & 3 deletions src/extensions/default/PrefsCodeHints/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ define(function (require, exports, module) {
};

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

if (this.ctxInfo && this.ctxInfo.tokenType) {
// Disallow hints for blacklisted keys.
// Disallow hints for blocklisted keys.
if (this.ctxInfo.tokenType === JSONUtils.TOKEN_KEY &&
parentKeyBlacklist.indexOf(this.ctxInfo.parentKeyName) !== -1) {
parentKeyBlocklist.indexOf(this.ctxInfo.parentKeyName) !== -1) {
return false;
}
return true;
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/default/PrefsCodeHints/unittests.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ define(function (require, exports, module) {
verifyHints(hintList, "spaceUnits");
});

it("should NOT hint for blacklisted parent keys", function () {
it("should NOT hint for blocklisted parent keys", function () {
// Between " and txt"
testEditor.setCursorPos({line: 4, ch: 9});
expectNoHints(PrefsCodeHints.hintProvider);
Expand Down
2 changes: 1 addition & 1 deletion src/language/JSONUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ define(function (require, exports, module) {
var TOKEN_KEY = 1,
TOKEN_VALUE = 2;

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

// Reg-ex to match colon, comma, opening bracket of an array and white-space.
Expand Down
12 changes: 6 additions & 6 deletions test/perf/OpenFile-perf-files/brackets-concat.js
Original file line number Diff line number Diff line change
Expand Up @@ -10839,7 +10839,7 @@ define('document/TextRange',['require','exports','module'],function (require, ex
* destroy() an Editor that's going away so it can release its Document ref.
*
* For now, there's a distinction between the "master" Editor for a Document - which secretly acts
* as the Document's internal model of the text state - and the multitude of "slave" secondary Editors
* as the Document's internal model of the text state - and the multitude of "subordinate" secondary Editors
* which, via Document, sync their changes to and from that master.
*
* For now, direct access to the underlying CodeMirror object is still possible via _codeMirror --
Expand Down Expand Up @@ -11056,7 +11056,7 @@ define('editor/Editor',['require','exports','module','editor/EditorManager','edi
*
* @param {!Document} document
* @param {!boolean} makeMasterEditor If true, this Editor will set itself as the (secret) "master"
* Editor for the Document. If false, this Editor will attach to the Document as a "slave"/
* Editor for the Document. If false, this Editor will attach to the Document as a "subordinate"/
* secondary editor.
* @param {!string} mode Syntax-highlighting language mode; "" means plain-text mode.
* See {@link EditorUtils#getModeFromFileExtension()}.
Expand Down Expand Up @@ -16178,7 +16178,7 @@ define('editor/EditorManager',['require','exports','module','file/FileUtils','co
* file extension. The editor is appended to the given container as a visible child.
* @param {!Document} doc Document for the Editor's content
* @param {!boolean} makeMasterEditor If true, the Editor will set itself as the private "master"
* Editor for the Document. If false, the Editor will attach to the Document as a "slave."
* Editor for the Document. If false, the Editor will attach to the Document as a "subordinate."
* @param {!jQueryObject} container Container to add the editor to.
* @param {{startLine: number, endLine: number}=} range If specified, range of lines within the document
* to display in this editor. Inclusive.
Expand Down Expand Up @@ -49093,7 +49093,7 @@ define('document/TextRange',['require','exports','module'],function (require, ex
* destroy() an Editor that's going away so it can release its Document ref.
*
* For now, there's a distinction between the "master" Editor for a Document - which secretly acts
* as the Document's internal model of the text state - and the multitude of "slave" secondary Editors
* as the Document's internal model of the text state - and the multitude of "subordinate" secondary Editors
* which, via Document, sync their changes to and from that master.
*
* For now, direct access to the underlying CodeMirror object is still possible via _codeMirror --
Expand Down Expand Up @@ -49310,7 +49310,7 @@ define('editor/Editor',['require','exports','module','editor/EditorManager','edi
*
* @param {!Document} document
* @param {!boolean} makeMasterEditor If true, this Editor will set itself as the (secret) "master"
* Editor for the Document. If false, this Editor will attach to the Document as a "slave"/
* Editor for the Document. If false, this Editor will attach to the Document as a "subordinate"/
* secondary editor.
* @param {!string} mode Syntax-highlighting language mode; "" means plain-text mode.
* See {@link EditorUtils#getModeFromFileExtension()}.
Expand Down Expand Up @@ -54432,7 +54432,7 @@ define('editor/EditorManager',['require','exports','module','file/FileUtils','co
* file extension. The editor is appended to the given container as a visible child.
* @param {!Document} doc Document for the Editor's content
* @param {!boolean} makeMasterEditor If true, the Editor will set itself as the private "master"
* Editor for the Document. If false, the Editor will attach to the Document as a "slave."
* Editor for the Document. If false, the Editor will attach to the Document as a "subordinate."
* @param {!jQueryObject} container Container to add the editor to.
* @param {{startLine: number, endLine: number}=} range If specified, range of lines within the document
* to display in this editor. Inclusive.
Expand Down

0 comments on commit 402ffab

Please sign in to comment.