Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
4f44f84
Testing codemirror's autocomplete
rchiodo Apr 18, 2019
20f721d
Remember monacoEditor pieces
rchiodo Apr 19, 2019
88ca7e1
New idea for using the language client
rchiodo Apr 22, 2019
192db0d
Farther along the completion provider idea.
rchiodo Apr 22, 2019
00cb505
New idea mapped together
rchiodo Apr 23, 2019
a98a817
Merge remote-tracking branch 'origin/master' into rchiodo/auto_comple…
rchiodo Apr 23, 2019
f12e3f8
Closer. no more errors
rchiodo Apr 24, 2019
d49a60a
Merge remote-tracking branch 'origin/master' into rchiodo/auto_comple…
rchiodo Apr 24, 2019
16df587
Working completion
rchiodo Apr 24, 2019
fa93010
Sorting
rchiodo Apr 24, 2019
0f738ae
Reverse sort kind
rchiodo Apr 24, 2019
00d0f3d
Merge remote-tracking branch 'origin/master' into rchiodo/auto_comple…
rchiodo Apr 24, 2019
d8bacb0
Getting monaco to show context menu and completion
rchiodo Apr 25, 2019
dc6cbde
Fix margin width
rchiodo Apr 25, 2019
e092f96
Add comment about language service
rchiodo Apr 25, 2019
16a2913
Start of completion provider
rchiodo Apr 25, 2019
e23e7cc
Update to use monaco types instead
rchiodo Apr 26, 2019
f2f6d9b
New IHistoryListener idea
rchiodo Apr 26, 2019
939dd5e
Fix document position
rchiodo Apr 26, 2019
54b9f6b
Theme support
rchiodo Apr 26, 2019
53516a0
Colorization mostly working
rchiodo Apr 30, 2019
612e632
Merge remote-tracking branch 'origin/master' into rchiodo/auto_comple…
rchiodo Apr 30, 2019
c48c6fc
Move editor to standalone panel at the bottom
rchiodo Apr 30, 2019
b31a54e
Fix startup of the language server
rchiodo Apr 30, 2019
7003077
Merge from master
rchiodo Apr 30, 2019
303d756
Input history working again
rchiodo Apr 30, 2019
df3fd6a
Fix problem with convertToOffset
rchiodo Apr 30, 2019
d75f48c
Write own react monaco editor to handle update problems
rchiodo May 1, 2019
4a49ab6
Add unit test for the completion provider
rchiodo May 1, 2019
0d008f7
Fix editing for intellisense
rchiodo May 1, 2019
446e48b
Adding hover support
rchiodo May 2, 2019
009048a
Fix hover to work even when expanding collapsing cells.
rchiodo May 2, 2019
9e28dff
Add suggest.css and base64 encoding of icons
rchiodo May 3, 2019
6199472
Fix completion item kind
rchiodo May 3, 2019
db38782
Undo less work. Not necessary
rchiodo May 3, 2019
5f64127
Put watermark back
rchiodo May 3, 2019
cb54437
Fix hover css
rchiodo May 3, 2019
d73843c
Fix scrolling after resizing
rchiodo May 4, 2019
62153a4
Add actual table to test state.
rchiodo May 6, 2019
b512cce
Split between jedi and language server
rchiodo May 6, 2019
8ad0942
Merge remote-tracking branch 'origin/master' into rchiodo/auto_comple…
rchiodo May 6, 2019
c57d459
Fix jedi for completion
rchiodo May 6, 2019
8870e0e
Merge from master
rchiodo May 7, 2019
1c93485
Fix remove cell and remove all to work
rchiodo May 7, 2019
c1c1921
Fix hover to work correctly with big hack
rchiodo May 8, 2019
f2b01e1
Don't ever remove items from the document as the cells that ran are s…
rchiodo May 8, 2019
28106fc
Make package createable
rchiodo May 8, 2019
d80845c
Add babel transpile for monaco-editor so tests can run
rchiodo May 8, 2019
4c3f33d
Input test in history functional working
rchiodo May 9, 2019
be5ed85
Get test to not hang on exit
rchiodo May 9, 2019
e375753
Get all history functional tests to pass
rchiodo May 9, 2019
db12ca5
Get tests somewhat working for intellisense
rchiodo May 10, 2019
163ce1f
Actual working intellisense test
rchiodo May 10, 2019
8e3d70d
Fix linter warnings
rchiodo May 10, 2019
5468a2e
Fix hover mtk1 css color
rchiodo May 10, 2019
a4f81e6
Add news entry
rchiodo May 10, 2019
79de88c
Remove react-codemirror
rchiodo May 10, 2019
01abc78
Fix hygiene
rchiodo May 10, 2019
396dd9e
Add variable to check remote
rchiodo May 10, 2019
c1d28d1
Fix default rules to support comment/string beginnings
rchiodo May 10, 2019
bd9c49b
Fix unnecessary isNull check
rchiodo May 10, 2019
cfefcf0
Make sure to cleanup after waiting for the suggestion to show up
rchiodo May 11, 2019
c808487
Fix out of memory error.
rchiodo May 13, 2019
a95001b
Separate out the babel steps as not required for single workspace
rchiodo May 13, 2019
d4e84d6
Fix color test
rchiodo May 13, 2019
dc840df
Review feedback
rchiodo May 14, 2019
f246e57
Update incorrect block comment
rchiodo May 14, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
208 changes: 208 additions & 0 deletions ThirdPartyNotices-Repository.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Microsoft Python extension for Visual Studio Code incorporates third party mater
11. pythonVSCode (https://github.com/DonJayamanne/pythonVSCode)
12. Sphinx (http://sphinx-doc.org/)
13. nteract (https://github.com/nteract/nteract)
14. less-plugin-inline-urls (https://github.com/less/less-plugin-inline-urls/)


%%
Expand Down Expand Up @@ -753,3 +754,210 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

=========================================
END OF nteract NOTICES, INFORMATION, AND LICENSE

%% less-plugin-inline-urls NOTICES, INFORMATION, AND LICENSE BEGIN HERE
=========================================
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

=========================================
END OF less-plugin-inline-urls NOTICES, INFORMATION, AND LICENSE
62 changes: 62 additions & 0 deletions build/webpack/plugins/less-plugin-base64.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// Most of this was based on https://github.com/less/less-plugin-inline-urls
// License for this was included in the ThirdPartyNotices-Repository.txt
const less = require('less');

class Base64MimeTypeNode {
constructor() {
this.value = "image/svg+xml;base64";
this.type = "Base64MimeTypeNode";
}

eval(context) {
return this;
}
}

class Base64Visitor {

constructor() {
this.visitor = new less.visitors.Visitor(this);

// Set to a preEval visitor to make sure this runs before
// any evals
this.isPreEvalVisitor = true;

// Make sure this is a replacing visitor so we remove the old data.
this.isReplacing = true;
}

run(root) {
return this.visitor.visit(root);
}

visitUrl(URLNode, visitArgs) {
// Return two new nodes in the call. One that has the mime type and other with the node. The data-uri
// evaluator will transform this into a base64 string
return new less.tree.Call("data-uri", [new Base64MimeTypeNode(), URLNode.value], URLNode.index || 0, URLNode.currentFileInfo);
}

}
/*
* This was originally used to perform less on uris and turn them into base64 encoded so they can be loaded into
* a webpack html. There's one caveat though. Less and webpack don't play well together. It runs the less at the root dir.
* This means in order to use this in a less file, you need to qualify the urls as if they come from the root dir.
* Example:
* url("./foo.svg")
* becomes
* url("./src/datascience-ui/history-react/images/foo.svg")
*/
class Base64Plugin {
constructor() {
}

install(less, pluginManager) {
pluginManager.addVisitor(new Base64Visitor());
}

printUsage() {
console.log('Base64 Plugin. Add to your webpack.config.js as a plugin to convert URLs to base64 inline')
}
}

module.exports = Base64Plugin;
4 changes: 4 additions & 0 deletions build/webpack/webpack.extension.dependencies.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ const config = {
// 'find' the calling extension.
new copyWebpackPlugin([
{ from: './package.json', to: '.' }
]),
// onigasm requires our onigasm.wasm to be in node_modules
new copyWebpackPlugin([
{ from: './node_modules/onigasm/lib/onigasm.wasm', to: './node_modules/onigasm/lib/onigasm.wasm' }
])
],
resolve: {
Expand Down
4 changes: 4 additions & 0 deletions build/webpack/webpack.extension.dependencies.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ const config: webpack.Configuration = {
// 'find' the calling extension.
new copyWebpackPlugin([
{ from: './package.json', to: '.' }
]),
// onigasm requires our onigasm.wasm to be in node_modules
new copyWebpackPlugin([
{ from: './node_modules/onigasm/lib/onigasm.wasm', to: './node_modules/onigasm/lib/onigasm.wasm' }
])
],
resolve: {
Expand Down
1 change: 1 addition & 0 deletions news/1 Enhancements/5342.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Provide basic intellisense using the language server.
Loading