1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Commit Graph

6298 Commits

Author SHA1 Message Date
Matthijs Kooijman
8f1ae9ba0b Remove SketchCode::getLineCount()
It was not used anymore, and removing it makes subsequent refactoring
easier.
2016-08-26 16:42:44 +02:00
Matthijs Kooijman
982d4f3fbf Use a separate RSyntaxTextArea for each editor tab
RSyntaxTextArea appears to support using a single instance and replacing
the underlying text and document when switching between tabs, but in
practice this support is not complete and even though the
RSyntaxTextArea developers did some work to improve the situation, they
recommend to just use a seperate instance for each tab.

This commit implements exactly that. A new class EditorTab is introduce
to wrap the RSyntaxTextArea and containing scroll pane, and to
encapsulate the code related to handling the text area itself. Doing so
removes some quirks and prepares for some later additions. In
particular, error highlights are now no longer shared between all tabs,
which was previously the case.

This commit mostly moves code from Editor into EditorTab, and updates
the callers to use getCurrentTab() and call methods on the result
instead of calling them on Editor. Some code is added to take care of
creating multiple EditorTab objects and switching between them. Some
small changes have been made to make the flow of opening files work,
though these are mostly a bit hacky.

While moving code, changes to the rest of the code were kept minimal,
retaining existing interfaces as much as possible. This sometimes result
in less than ideal code, which should be cleaned up in subsequent
commits.

The SketchCodeDocument class has been pretty much emptied out, since
it was mostly used to store things for tabs in the background, which are
now just stored in each RSyntaxTextArea separately. The last remaining
bits of this class can probably be moved or implemented differently
later, so it can be removed.

The entire flow of working with sketches and files needs to be cleaned
up next, so no thorough attempt at testing this commit was done. It is
likely that there are plenty of corner cases and race conditions, which
will be fixed once the reset of the code is cleaned up.

Fixes #3441
2016-08-26 16:42:44 +02:00
Matthijs Kooijman
c945b6c30a Let EditorToolbar use the global KeyboardFocusManager
For some toolbar buttons, when it is clicked while shift is pressed, its
function changes. When handling the click event, this information is
directly taken from KeyEvent.isShiftDown(). However, to also show the
proper tooltip *before* clicking, EditorToolbar listened to key events
on the main text area, to know when shift is (not) pressed.

This approach means that pressing shift while the text area is not
focused will not change the tooltip, and creates some unwanted coupling
between the toolbar and the text area.

This commit changes this approach to instead use the global
KeyboardFocusManager. Any key presses pass through there before being
dispatched to the currently focused component, so this makes sure that
any shift presses are caught, as well as making EditorToolbar a bit more
self-contained.
2016-08-26 16:42:44 +02:00
Cristian Maglie
2e708410d4 Merge branch 'patch-1' of https://github.com/dagwieers/Arduino-1 2016-08-22 14:46:10 +02:00
probonopd
66128dabcc Key "MimeType" is a list and needs a semicolon as trailing character
https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#mime-types
2016-08-20 13:07:42 +02:00
Cristian Maglie
5102ed46ee Workaround for MacOSX gatekeeper (OSX 10.10.4)
Reapply d6c5344b67 until avrdude 6.3
is fixed.
2016-08-17 18:28:41 +02:00
Cristian Maglie
d6db1deef0 Update revision log 2016-08-17 17:24:04 +02:00
Cristian Maglie
59e7c9ef60 Revert "Improve Examples menu"
This reverts commit 7235f9dc15.
2016-08-17 17:08:21 +02:00
Cristian Maglie
b583697e0b Revert "Only sort ideLibs if it's not empty"
This reverts commit 9b324bc9cc.
2016-08-17 17:08:14 +02:00
Cristian Maglie
e50af34c50 Releasing 1.6.11 2016-08-17 12:39:11 +02:00
Cristian Maglie
e0ea137737 Imported new translations 2016-08-17 12:37:19 +02:00
Cristian Maglie
4c6d2f4a82 Added new languages ach, kk and te 2016-08-16 13:16:38 +02:00
Cristian Maglie
aea77c889d Fixed some simple warnings 2016-08-16 12:52:24 +02:00
Cristian Maglie
6ac028244e Updated translations 2016-08-16 12:51:44 +02:00
Cristian Maglie
49b98959c5 Correctly handle "-snapshot" and "+build" in semantic versioning
This fix a regression introduced in:

048a8a61 (VersionHelper now correctly strip snapshot info)

actually neither 048a8a61 nor the version before are correct becuase:

048a8a61 - strips all the extra `-snapshot` and `+build`
previous - doesn't handle the case `x.y-snapshot`

Now both are handled correctly and a test has been added to verify this.

To be completely semver compliant we should deny versions in the
format `x.y`, but this will break all legacy version that have been
published until now, so this changed should be postponed for the next
major release of the IDE.

Fix #5251
2016-08-16 11:00:35 +02:00
Paul Vivier
0272252e6a Update SoftwareSerialExample.ino
Also includes Micros per https://www.arduino.cc/en/Reference/SoftwareSerial
2016-08-14 19:14:53 -04:00
Cristian Maglie
eee54f1b3a Merge branch 'examplesmenu' of git://github.com/PaulStoffregen/Arduino into HEAD 2016-08-12 17:21:24 +02:00
Cristian Maglie
7f630121e2 Update revision log 2016-08-12 17:20:48 +02:00
Cristian Maglie
d5dc479e6b library_index.json is no more bundled.
There is no reason to bundle this file.

If the index file is not available an empty index is
returned by the parser.

Fix #5143
(together with e80c08: Use a specific hardware/package_index_bundled.json)
2016-08-12 17:20:03 +02:00
Cristian Maglie
b695e7ff1e Do not fail if a package_index.json is not present
Since we are not bundling a package_index.json anymore, there is no
need for the timestamp check with the existing package_index.json.
2016-08-12 10:27:35 +02:00
Cristian Maglie
e731fe026f Boards Manager now install tools even if they are available in the IDE bundle
Previously if a 3rd party core would require a tool already bundled
in the IDE then boards manager skipped the installation of that tool.
This is could lead to missing tools if the IDE is upgraded and the
bundled tools may change.

This patch fixes the bug by always installing tools when needed, even
if they are already bundled.
2016-08-11 17:29:13 +02:00
Cristian Maglie
d8470e59f4 Mark built-in tools as readonly and do not remove them when uninstalling
This covers a very convoluted use-case that may be reproduce this way:

1. Using an previous version of the IDE, a new AVR core is installed
   using the board manager.
2. The IDE is then updated so the core installed in 1. is now also the
   bundled one
3. The AVR core installed 1. is now removed using the board manager
4. The board manager will uninstall the (presumably) no longer used tools,
   from the built-in folder leaving, in fact, the IDE without the
   bundled tools that are supposed to be read-only.

This commit fix this bug by actually making the built-in tool read-only
2016-08-11 14:21:54 +02:00
Cristian Maglie
b1f9164c4c Slightly refactored ContributionsIndexer.syncBuiltInHardware()
This is just a small rewrite of the function in a more clear way,
no change in behavior.
2016-08-11 13:33:08 +02:00
Cristian Maglie
e80c085996 Use a specific hardware/package_index_bundled.json. AVR core version to 1.6.13
Previously, during the build, the full package_index.json was downloaded
and distributed with the Arduino IDE.
This lead to a situation where it was difficult to test new AVR cores
before publishing them to the public package_index.json.

Now the bundled AVR core is specificed in the file:
`hardware/package_index_bundled.json`
this index is loaded from the IDE at startup and the package_index.json
is overlayed on it.

This should also solve part of #5143 (Repeatable builds and snapshots of
package/library indexes)
2016-08-11 11:02:03 +02:00
Cristian Maglie
7008f6c57c ContributionsIndexer now has bundled hardware path as a field 2016-08-11 10:57:05 +02:00
Cristian Maglie
9669d67e16 Revert to avrdude 6.0.1
This reverts commits:
385edd26fc (Removed "macosx-fix-bundled-toolchain-missing-symlinks" build task)
f5fd6423c3 (Updated avrdude to 6.3-arduino2)
5a01929b8f (avrdude 6.3: fixed IDE build for macosx)

And part of this commit:
05b647721c (Update avr-gcc to 4.9.2 and avrdude to 6.3)
2016-08-11 10:57:05 +02:00
Cristian Maglie
629b662de3 Revert "Bump avr core version to 1.6.13"
This must be made together with the release of AVR core 1.6.13.

This reverts commit d20e608623.
2016-08-09 14:58:47 +02:00
Cristian Maglie
048a8a61d6 VersionHelper now correctly strip snapshot info 2016-08-05 18:09:42 +02:00
Cristian Maglie
e0b2cd0ffe Handle invalid versions without NullPointerExceptions 2016-08-05 18:09:42 +02:00
Martino Facchin
d20e608623 Bump avr core version to 1.6.13 2016-08-05 16:59:51 +02:00
Cristian Maglie
15e08ee331 Update revision log 2016-08-05 14:01:21 +02:00
Cristian Maglie
701f4a23df Update revision log and bumped IDE version to 1.6.11 2016-08-05 10:58:08 +02:00
Cristian Maglie
f19bf5cf4c Use plain exec methods on arduino-builder invocation
ApacheCommons do some command-line tweaking that doesnt fit well
with argument passing to arduino-builder, in particular for -prefs
arguments containing spaces.
2016-08-05 10:19:07 +02:00
Cristian Maglie
b4ada94e44 Do not bail out if a required tool is not found
Previously a NullPointer exception was thrown.
Now the build go on and fails when the recipe cannot be replaced
the correct tool path, that is a much more informative error.
2016-08-03 18:51:08 +02:00
Cristian Maglie
910c602546 Merge branch 'fix-tools' 2016-08-03 16:27:09 +02:00
jenkins
9e6c0a66bd update arduino-builder to 1.3.20 2016-08-03 16:23:14 +02:00
Cristian Maglie
723393227c Require tools from referenced core platform if used 2016-08-02 15:16:00 +02:00
Cristian Maglie
4f1b584e71 Slightly refactored tool resolution
This helps the understanding of next commits
2016-08-02 15:15:59 +02:00
Cristian Maglie
3b57462281 Use latest tools version for generic tool.paths properties 2016-08-02 15:15:59 +02:00
Martino Facchin
6f24fa6cec Pass runtime tools to arduino-builder 2016-08-02 15:15:59 +02:00
Cristian Maglie
fa0678f5b7 added 'runtime.tools.packager-name-version.path' property in the global properties map 2016-08-02 12:13:31 +02:00
Cristian Maglie
2c6f6e76c4 Boards tools are resolved using informations from package_index.json 2016-08-02 12:12:00 +02:00
PaulStoffregen
9b324bc9cc Only sort ideLibs if it's not empty 2016-08-02 02:43:04 -07:00
Cristian Maglie
8efed7f2d2 Add reference to packager in tools 2016-08-02 10:45:48 +02:00
PaulStoffregen
7235f9dc15 Improve Examples menu 2016-07-28 16:58:28 -07:00
Cristian Maglie
3db7ec2de0 Releasing IDE 1.6.10 2016-07-26 15:13:41 +02:00
Martino Facchin
961208b2c6 update liblistserials to 1.1.4 2016-07-26 14:13:38 +02:00
Martino Facchin
e8a74beae7 Merge pull request #5161 from facchinm/toolchain_4.9.2-atmel3.5.3-arduino2
Update avr toolchain to 4.9.2-atmel3.5.3-arduino2
2016-07-26 11:30:38 +02:00
Martino Facchin
2415498094 update avr toolchain to 4.9.2-atmel3.5.3-arduino2 2016-07-26 10:10:28 +02:00
Cristian Maglie
44b748af7b Updated translations strings 2016-07-25 16:32:02 +02:00