Skip to content

Commit

Permalink
Prepping for release
Browse files Browse the repository at this point in the history
  • Loading branch information
mat-mcloughlin committed Mar 31, 2015
1 parent 8a3f9a7 commit 092c466
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 40 deletions.
4 changes: 2 additions & 2 deletions htmlContent/console-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
Omnisharp Output
</button>

<button id="btnOutput" class="btn small disabled" data-filter="output">
<!-- <button id="btnOutput" class="btn small disabled" data-filter="output">
Output
</button>
</button> -->
</div>
<a href="#" class="close">&times;</a>
</div>
Expand Down
7 changes: 7 additions & 0 deletions install.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@echo off
CALL npm install
SET TMPFOLDER=%TEMP%\%RANDOM%
CALL git clone https://github.com/OmniSharp/omnisharp-server-roslyn-binaries.git %TMPFOLDER%
RD /S /Q node\server
xcopy /S /E /Y /I %TMPFOLDER%\lib\server %CD%\node\server
RD /S /Q %TMPFOLDER%
File renamed without changes.
3 changes: 3 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ define(function (require, exports, module) {
//CommandManager.get(OmniCommands.FIX_USINGS).setEnabled(true);
CommandManager.get(OmniCommands.FORMAT_DOCUMENT).setEnabled(true);
CommandManager.get(OmniCommands.FIND_SYMBOLS).setEnabled(true);
CommandManager.get(OmniCommands.RELOAD_REFERENCE_DISPLAY).setEnabled(true);
}

function disable() {
Expand All @@ -41,6 +42,7 @@ define(function (require, exports, module) {
//CommandManager.get(OmniCommands.FIX_USINGS).setEnabled(false);
CommandManager.get(OmniCommands.FORMAT_DOCUMENT).setEnabled(false);
CommandManager.get(OmniCommands.FIND_SYMBOLS).setEnabled(false);
CommandManager.get(OmniCommands.RELOAD_REFERENCE_DISPLAY).setEnabled(false);
}

function createMenu() {
Expand All @@ -53,6 +55,7 @@ define(function (require, exports, module) {
menu.addMenuItem(OmniCommands.FORMAT_DOCUMENT, prefs.get('formatDocument'));
menu.addMenuItem(OmniCommands.FIND_SYMBOLS, prefs.get('findSymbols'));
menu.addMenuItem(OmniCommands.RELOAD_REFERENCE_DISPLAY);
menu.addMenuItem(OmniCommands.SHOW_CONSOLE);

disable();
}
Expand Down
27 changes: 15 additions & 12 deletions modules/console.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ define(function (require, exports, module) {
}

function render() {
var $console = _panel.$panel.find(".console"),
var $console = _panel.$panel.find(".console"),
$element = "",
i = 0;
i = 0;

for (i = 0; i < _logData.length; i++) {
for (i = 0; i < _logData.length; i++) {
if (_logData[i].text === '' || _logData[i].type !== _currentPanel) {
continue;
}
Expand All @@ -32,25 +32,24 @@ define(function (require, exports, module) {
$element.val(_logData[i].text);
$element.addClass(_logData[i].type);

$console.append($element);
}
$console.append($element);
}
$console.animate({ scrollTop: $console[0].scrollHeight }, 20);
}
}

function add(msg, type) {
var texts = msg.toString().split('\n'),
i = 0;
var texts = msg.toString().split('\n'),
i = 0;

for (i = 0; i < texts.length; i++) {
_logData.push({type: type, text: texts[i]});
}
for (i = 0; i < texts.length; i++) {
_logData.push({type: type, text: texts[i]});
}

render();
}

exports.init = function() {
_panel = WorkspaceManager.createBottomPanel('omnisharp.console', $(ConsoleTemplate));
_panel.show();

_panel.$panel.find(".close").on("click", function () {
_panel.hide();
Expand All @@ -72,4 +71,8 @@ define(function (require, exports, module) {
add(data, 'omnisharp');
});
};

exports.show = function() {
_panel.show();
};
});
2 changes: 0 additions & 2 deletions modules/goToDefinition.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ define(function (require, exports, module) {
Helpers = require('modules/helpers');

exports.exec = function () {
var req = Helpers.buildRequest();

Omnisharp.gotoDefinition()
.done(function (res) {
if (res.FileName === null) {
Expand Down
2 changes: 1 addition & 1 deletion modules/intellisense.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ define(function (require, exports, module) {
hints: completions,
match: null,
selectInitial: true,
handleWideResults: true
handleWideResults: false
});
})
.fail(deferred.reject);
Expand Down
10 changes: 10 additions & 0 deletions modules/klr.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
/*global define, $, brackets, window, Mustache */

define(function (require, exports, module) {
'use strict';

exports.showKLRProjects = function() {

};
});
2 changes: 1 addition & 1 deletion modules/omniCommands.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ define(function (require, exports, module) {
exports.FIX_CODE_ISSUE = packageString + 'fixCodeIssue';
exports.RELOAD_REFERENCE_DISPLAY = packageString + 'reloadReferenceDisplay';
exports.FIND_SYMBOLS = packageString + 'findSymbols';

exports.SHOW_CONSOLE = packageString + 'showConsole';
});
4 changes: 3 additions & 1 deletion modules/omniHandlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ define(function (require, exports, module) {
GoToDefinitionCommand = require('modules/goToDefinition'),
FindSymbols = require('modules/findSymbols'),
FormatCode = require('modules/formatCode'),
ReferenceDisplay = require('modules/referenceDisplay');
ReferenceDisplay = require('modules/referenceDisplay'),
Console = require('modules/console');

// function fixCodeIssue() {
// Helpers.makeRequestAndRefreshDocument('fixcodeissue');
Expand All @@ -33,6 +34,7 @@ define(function (require, exports, module) {
//CommandManager.register(OmniStrings.CMD_FIX_CODE_ISSUE, OmniCommands.FIX_CODE_ISSUE, fixCodeIssue);
CommandManager.register(OmniStrings.CMD_RELOAD_REFERENCE_DISPLAY, OmniCommands.RELOAD_REFERENCE_DISPLAY, ReferenceDisplay.reload);
CommandManager.register(OmniStrings.CMD_FIND_SYMBOLS, OmniCommands.FIND_SYMBOLS, FindSymbols.exec);
CommandManager.register(OmniStrings.CMD_SHOW_CONSOLE, OmniCommands.SHOW_CONSOLE, Console.show);
}

exports.init = init;
Expand Down
2 changes: 2 additions & 0 deletions modules/omniStrings.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ define(function (require, exports, module) {
//exports.CMD_FIX_CODE_ISSUE = 'Fix Code Issue';
exports.CMD_RELOAD_REFERENCE_DISPLAY = 'Reload References Display';
exports.CMD_FIND_SYMBOLS = 'Find Symbols';
exports.CMD_SHOW_CONSOLE = 'Show Console';

});
3 changes: 0 additions & 3 deletions modules/rename.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ define(function (require, exports, module) {
var renameTo = $input.val();

if (buttonId === 'renameOk' && renameTo !== undefined) {
var data = Helpers.buildRequest();
data.renameto = renameTo;

Omnisharp.rename({renameTo: renameTo})
.done(function (res) {
res.Changes.forEach(function (change) {
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "omnisharp-brackets",
"title": "omnisharp-brackets",
"description": "C# IDE plugin for brackets.io.\nOmniSharp is a family of Open Source projects, each with one goal - To enable great .NET development in YOUR editor of choice.",
"description": "C# IDE plugin for brackets.io.\nOmniSharp is a family of Open Source projects, each with one goal - To enable great .NET development in YOUR editor of choice.\n\n IMPORTANT: You must run the install script in the extension directory for the plugin to work.\n\nThis is because of a limitation on the size of the extensions size",
"homepage": "https://github.com/OmniSharp/omnisharp-brackets",
"version": "0.0.3",
"version": "0.3.0",
"private": true,
"author": "Mathew McLoughlin mathew.mcloughlin@gmail.com (http://omnisharp.net)",
"license": "MIT",
"engines": {
Expand Down
7 changes: 4 additions & 3 deletions package.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
./build.sh
rm../omnisharp-brackets.zip
zip -r ../omnisharp-brackets.zip ../omnisharp-brackets -x "*.DS_Store .git"
rm -rf node_modules
rm -rf node/server
rm ../omnisharp-brackets.zip
zip -r ../omnisharp-brackets.zip ../omnisharp-brackets -x *.DS_Store *.git* *README.md*
17 changes: 4 additions & 13 deletions styles/omnisharp.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ span.Parameter {
background-image: url('images/icons/autocomplete_field.png');
}

span.Struct {
background-image: url('images/icons/autocomplete_struct.png');
}

span.intellisense {
line-height: 16px !important;
display: inline-block;
Expand Down Expand Up @@ -164,19 +168,6 @@ omnisharp-references .inline-editor-header {
color: rgb(112, 112, 0);
}


#editor-console-icon {
background: url("../assets/icon.png");
background-size: 22px;
background-position: center;
}

#editor-console-icon.on {
background: url("../assets/icon-on.png");
background-size: 22px;
background-position: center;
}

#editor-console .label {
text-shadow: none;
margin-left: 4px;
Expand Down

0 comments on commit 092c466

Please sign in to comment.