Skip to content

Commit

Permalink
Fixes: #6899
Browse files Browse the repository at this point in the history
- CHANGELOG now properly references pull request

Signed-off-by: Justin Ang <justinang13@gmail.com>
  • Loading branch information
justin8502 authored and vince-fugnitto committed Jan 27, 2020
1 parent 8ff8bdc commit e1d08d0
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Breaking changes:
- In your `package.json` you can define:
- `theiaPluginDir`: to specify the folder in which to download plugins, in respect to your `package.json`
- `theiaPlugins`: to specify the list of plugins in the form of `"id": "url"`
- [core] renamed method `registerComositionEventListeners()` to `registerCompositionEventListeners()` [#6961](https://github.com/eclipse-theia/theia/pull/6961)
- [core] removed `virtual-renderer`. `react-renderer` should be used instead [#6885](https://github.com/eclipse-theia/theia/pull/6885)
- [core] removed `virtual-widget`. `react-widget` should be used instead [#6885](https://github.com/eclipse-theia/theia/pull/6885)
- [task] renamed method `getStrigifiedTaskSchema()` has been renamed to `getStringifiedTaskSchema()` [#6780](https://github.com/eclipse-theia/theia/pull/6780)
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/browser/common-frontend-contribution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1564,31 +1564,31 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
dark: 'editorWarning.foreground',
light: 'editorWarning.foreground',
hc: 'editorWarning.foreground'
}, description: 'Background of hovered statusbar item in case the theia server is offlline.'
}, description: 'Background of hovered statusbar item in case the theia server is offline.'
},
{
id: 'statusBar.offlineForeground',
defaults: {
dark: 'editor.background',
light: 'editor.background',
hc: 'editor.background'
}, description: 'Background of hovered statusbar item in case the theia server is offlline.'
}, description: 'Background of hovered statusbar item in case the theia server is offline.'
},
{
id: 'statusBarItem.offlineHoverBackground',
defaults: {
dark: Color.lighten('statusBar.offlineBackground', 0.4),
light: Color.lighten('statusBar.offlineBackground', 0.4),
hc: Color.lighten('statusBar.offlineBackground', 0.4)
}, description: 'Background of hovered statusbar item in case the theia server is offlline.'
}, description: 'Background of hovered statusbar item in case the theia server is offline.'
},
{
id: 'statusBarItem.offlineActiveBackground',
defaults: {
dark: Color.lighten('statusBar.offlineBackground', 0.6),
light: Color.lighten('statusBar.offlineBackground', 0.6),
hc: Color.lighten('statusBar.offlineBackground', 0.6)
}, description: 'Background of active statusbar item in case the theia server is offlline.'
}, description: 'Background of active statusbar item in case the theia server is offline.'
},
// Buttons
{
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/browser/external-uri-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class ExternalUriService {
*
* By default maps to an origin serving Theia.
*
* Use `parseLocalhost` to retrive localhost address and port information.
* Use `parseLocalhost` to retrieve localhost address and port information.
*/
resolve(uri: URI): MaybePromise<URI> {
const localhost = this.parseLocalhost(uri);
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/browser/frontend-application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export class FrontendApplication {
/**
* Register composition related event listeners.
*/
protected registerComositionEventListeners(): void {
protected registerCompositionEventListeners(): void {
window.document.addEventListener('compositionstart', event => {
this.inComposition = true;
});
Expand All @@ -180,7 +180,7 @@ export class FrontendApplication {
* Register global event listeners.
*/
protected registerEventListeners(): void {
this.registerComositionEventListeners(); /* Hotfix. See above. */
this.registerCompositionEventListeners(); /* Hotfix. See above. */

window.addEventListener('beforeunload', () => {
this.stateService.state = 'closing_window';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ function getLayoutId(layout: KeyboardLayoutData): string {
}

/**
* Keyboard layout files are expexted to have the following name scheme:
* Keyboard layout files are expected to have the following name scheme:
* `language-name-hardware.json`
*
* - `language`: A language subtag according to IETF BCP 47
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/browser/keyboard/keys.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ describe('keys api', () => {
expect(keycode.key).is.equal(Key.MINUS);
});

it('should parse minus as key and seprator', () => {
it('should parse minus as key and separator', () => {
const keycode = KeyCode.parse('ctrl--');
expect(keycode.ctrl).to.be.true;
expect(keycode.key).is.equal(Key.MINUS);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,15 +279,15 @@ export class PreferenceSchemaProvider extends PreferenceProvider {
let property;
const overridden = this.overriddenPreferenceName(preferenceName);
if (overridden) {
// try from overriden schema
// try from overridden schema
property = this.overridePatternProperties[`[${overridden.overrideIdentifier}]`];
property = property && property[overridden.preferenceName];
if (!property) {
// try from overriden identifier
// try from overridden identifier
property = this.overridePatternProperties[overridden.preferenceName];
}
if (!property) {
// try from overriden value
// try from overridden value
property = this.combinedSchema.properties[overridden.preferenceName];
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/browser/shell/application-shell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const MAIN_AREA_CLASS = 'theia-app-main';
const BOTTOM_AREA_CLASS = 'theia-app-bottom';

export type ApplicationShellLayoutVersion =
/** layout versioning is introduced, unversiouned layout are not compatible */
/** layout versioning is introduced, unversioned layout are not compatible */
2.0 |
/** view containers are introduced, backward compatible to 2.0 */
3.0;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/browser/shell/tab-bars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class TabBarRenderer extends TabBar.Renderer {

// TODO refactor shell, rendered should only receive props with event handlers
// events should be handled by clients, like ApplicationShell
// right now it is mess: (1) client logic belong to renderer, (2) cyclic dependencies between renderes and clients
// right now it is mess: (1) client logic belong to renderer, (2) cyclic dependencies between renderers and clients
constructor(
protected readonly contextMenuRenderer?: ContextMenuRenderer,
protected readonly decoratorService?: TabBarDecoratorService,
Expand Down

0 comments on commit e1d08d0

Please sign in to comment.