Skip to content

Commit

Permalink
Added simple compilation feedback to Mac App
Browse files Browse the repository at this point in the history
  • Loading branch information
Angel Garcia authored and Angel Garcia committed Nov 28, 2017
1 parent 041717e commit fb8798b
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 12 deletions.
34 changes: 22 additions & 12 deletions Sources/SwiftKotlinApp/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,18 +691,18 @@
<rect key="frame" x="0.0" y="0.0" width="680" height="480"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="Lxu-KE-Cuh">
<rect key="frame" x="10" y="10" width="325" height="435"/>
<scrollView misplaced="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="Lxu-KE-Cuh">
<rect key="frame" x="10" y="27" width="325" height="418"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
<clipView key="contentView" id="rBo-yE-51C">
<rect key="frame" x="1" y="1" width="323" height="433"/>
<rect key="frame" x="1" y="1" width="323" height="416"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView autoresizesSubviews="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="panel" allowsUndo="YES" id="Edu-qR-eKg">
<rect key="frame" x="0.0" y="0.0" width="308" height="433"/>
<rect key="frame" x="0.0" y="0.0" width="308" height="416"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<size key="minSize" width="308" height="433"/>
<size key="minSize" width="308" height="416"/>
<size key="maxSize" width="6000" height="10000000"/>
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<connections>
Expand All @@ -717,22 +717,22 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="4zw-mX-SGb">
<rect key="frame" x="308" y="1" width="16" height="433"/>
<rect key="frame" x="308" y="1" width="16" height="416"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="MqM-2d-jmk">
<rect key="frame" x="345" y="10" width="325" height="435"/>
<scrollView misplaced="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="MqM-2d-jmk">
<rect key="frame" x="345" y="27" width="325" height="418"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="KeA-4w-mWI">
<rect key="frame" x="1" y="1" width="323" height="433"/>
<rect key="frame" x="1" y="1" width="323" height="416"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView autoresizesSubviews="NO" editable="NO" drawsBackground="NO" importsGraphics="NO" verticallyResizable="YES" findStyle="panel" id="pog-tu-0qG">
<rect key="frame" x="0.0" y="-1" width="308" height="433"/>
<rect key="frame" x="0.0" y="-1" width="308" height="416"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<size key="minSize" width="308" height="433"/>
<size key="minSize" width="308" height="416"/>
<size key="maxSize" width="6000" height="10000000"/>
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
</textView>
Expand All @@ -744,7 +744,7 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="pI7-5G-k6M">
<rect key="frame" x="308" y="1" width="16" height="433"/>
<rect key="frame" x="308" y="1" width="16" height="416"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
Expand Down Expand Up @@ -788,9 +788,19 @@
<action selector="formatSwift:" target="XfG-lQ-9wD" id="osa-T5-3yn"/>
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" id="RLP-7n-pEc">
<rect key="frame" x="9" y="6" width="663" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" enabled="NO" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" id="nsR-Gf-VKi">
<font key="font" metaFont="system"/>
<color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
</view>
<connections>
<outlet property="feedbackTextField" destination="RLP-7n-pEc" id="qbA-4J-fS9"/>
<outlet property="kotlinTextView" destination="pog-tu-0qG" id="oZF-pH-Sgu"/>
<outlet property="swiftTextView" destination="Edu-qR-eKg" id="i1y-Q0-wwf"/>
</connections>
Expand Down
21 changes: 21 additions & 0 deletions Sources/SwiftKotlinApp/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class ViewController: NSViewController {

@IBOutlet var swiftTextView: NSTextView!
@IBOutlet var kotlinTextView: NSTextView!
@IBOutlet var feedbackTextField: NSTextField!

override func viewDidLoad() {
super.viewDidLoad()
Expand Down Expand Up @@ -53,6 +54,7 @@ class ViewController: NSViewController {
@IBAction func formatSwift(_ sender: AnyObject) {
let swift = swiftTextView.string
let result = swiftTokenizer.translate(content: swift)
updateFeedback(result: result)
guard let swiftTokens = result.tokens else {
return
}
Expand All @@ -65,6 +67,7 @@ class ViewController: NSViewController {
func translateSwift() {
let swift = swiftTextView.string
let result = kotlinTokenizer.translate(content: swift)
updateFeedback(result: result)
guard let kotlinTokens = result.tokens else {
return
}
Expand All @@ -83,6 +86,24 @@ class ViewController: NSViewController {
}
return attributedString
}

func updateFeedback(result: TokenizationResult) {
if let exception = result.exception {
feedbackTextField.textColor = NSColor.red
feedbackTextField.stringValue = "❌ - \(exception.localizedDescription)"
} else if !result.diagnostics.isEmpty {
if let error = result.diagnostics.filter({ $0.level != .warning }).first {
self.feedbackTextField.textColor = NSColor.red
self.feedbackTextField.stringValue = "❌ Line \(error.location.line) Col \(error.location.column) - \(error.kind.diagnosticMessage)"
} else {
let warn = result.diagnostics.first!
feedbackTextField.textColor = NSColor.yellow
feedbackTextField.stringValue = "⚠️ Line \(warn.location.line) Col \(warn.location.column) - \(warn.kind.diagnosticMessage)"
}
} else {
feedbackTextField.stringValue = "✅"
}
}
}

extension ViewController: NSTextViewDelegate {
Expand Down

0 comments on commit fb8798b

Please sign in to comment.